/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2017-09-03 09:00:31 UTC
  • Revision ID: teddy@recompile.se-20170903090031-zhxw13lca97zuysr
Plymouth plugin bug fix: Actually try the old PID file location

* plugins.d/plymouth.c (get_pid): Try both plymouth_pid and
  plymouth_old_pid, not just plymouth_pid twice.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2015-04-02">
 
6
<!ENTITY TIMESTAMP "2017-02-23">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
 
37
      <year>2010</year>
37
38
      <year>2011</year>
38
39
      <year>2012</year>
39
40
      <year>2013</year>
 
41
      <year>2014</year>
 
42
      <year>2015</year>
 
43
      <year>2016</year>
 
44
      <year>2017</year>
40
45
      <holder>Teddy Hogeborn</holder>
41
46
      <holder>Björn Påhlsson</holder>
42
47
    </copyright>
121
126
        <term><option>priority<literal> = </literal><replaceable
122
127
        >STRING</replaceable></option></term>
123
128
        <listitem>
124
 
          <xi:include href="mandos-options.xml"
125
 
                      xpointer="priority_compat"/>
 
129
          <xi:include href="mandos-options.xml" xpointer="priority"/>
126
130
        </listitem>
127
131
      </varlistentry>
128
132
      
201
205
      built-in module <systemitem class="library">ConfigParser</systemitem>
202
206
      requires it.
203
207
    </para>
 
208
    <xi:include href="bugs.xml"/>
204
209
  </refsect1>
205
210
  
206
211
  <refsect1 id="example">