/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 plugins.d/usplash.xml

  • Committer: teddy at recompile
  • Date: 2020-01-12 01:53:04 UTC
  • Revision ID: teddy@recompile.se-20200112015304-gqif9w4pbyix8w6b
mandos-ctl: Fix minor bug in tests

Fix two tests, the last assert of which would always erroneously
succeed.  (No change in non-test code needed.)

* mandos-ctl (Test_dbus_python_adapter_SystemBus): In the
  test_call_method_handles_exception() method, fix check for
  dbus.ConnectFailed exception.
  (Test_pydbus_adapter_SystemBus): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/usplash.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 "usplash">
5
 
<!ENTITY TIMESTAMP "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
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>
44
46
      <holder>Teddy Hogeborn</holder>
45
47
      <holder>Björn Påhlsson</holder>
46
48
    </copyright>
133
135
        <para>
134
136
          These variables will normally be inherited from
135
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
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>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
148
140
        </para>
149
141
        <para>
150
142
          This behavior is meant to exactly mirror the behavior of
288
280
    <para>
289
281
      <citerefentry><refentrytitle>intro</refentrytitle>
290
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
291
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
292
 
      <manvolnum>5</manvolnum></citerefentry>,
293
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
294
284
      <manvolnum>7</manvolnum></citerefentry>,
295
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>