/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/splashy.xml

  • Committer: Teddy Hogeborn
  • Date: 2017-09-03 09:00:31 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 362.
  • 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:
plugins.d/splashy.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "splashy">
5
 
<!ENTITY TIMESTAMP "2019-02-10">
 
5
<!ENTITY TIMESTAMP "2017-02-23">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
41
41
      <year>2015</year>
42
42
      <year>2016</year>
43
43
      <year>2017</year>
44
 
      <year>2018</year>
45
 
      <year>2019</year>
46
44
      <holder>Teddy Hogeborn</holder>
47
45
      <holder>Björn Påhlsson</holder>
48
46
    </copyright>
135
133
        <para>
136
134
          These variables will normally be inherited from
137
135
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
139
 
          have in turn inherited them from its calling process.
 
136
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
 
137
          normally have inherited them from
 
138
          <filename>/scripts/local-top/cryptroot</filename> in the
 
139
          initial <acronym>RAM</acronym> disk environment, which will
 
140
          have set them from parsing kernel arguments and
 
141
          <filename>/conf/conf.d/cryptroot</filename> (also in the
 
142
          initial RAM disk environment), which in turn will have been
 
143
          created when the initial RAM disk image was created by
 
144
          <filename
 
145
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
 
146
          extracting the information of the root file system from
 
147
          <filename >/etc/crypttab</filename>.
140
148
        </para>
141
149
        <para>
142
150
          This behavior is meant to exactly mirror the behavior of
266
274
    <para>
267
275
      <citerefentry><refentrytitle>intro</refentrytitle>
268
276
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
277
      <citerefentry><refentrytitle>crypttab</refentrytitle>
 
278
      <manvolnum>5</manvolnum></citerefentry>,
269
279
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
270
280
      <manvolnum>8mandos</manvolnum></citerefentry>,
271
281
      <citerefentry><refentrytitle>proc</refentrytitle>