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

  • Committer: teddy at recompile
  • Date: 2020-01-12 01:53:04 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • 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 "2012-01-01">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
 
36
      <year>2010</year>
36
37
      <year>2011</year>
37
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
38
46
      <holder>Teddy Hogeborn</holder>
39
47
      <holder>Björn Påhlsson</holder>
40
48
    </copyright>
127
135
        <para>
128
136
          These variables will normally be inherited from
129
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
130
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
131
 
          normally have inherited them from
132
 
          <filename>/scripts/local-top/cryptroot</filename> in the
133
 
          initial <acronym>RAM</acronym> disk environment, which will
134
 
          have set them from parsing kernel arguments and
135
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
136
 
          initial RAM disk environment), which in turn will have been
137
 
          created when the initial RAM disk image was created by
138
 
          <filename
139
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
140
 
          extracting the information of the root file system from
141
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
142
140
        </para>
143
141
        <para>
144
142
          This behavior is meant to exactly mirror the behavior of
218
216
      is ugly, but necessary as long as it does not support aborting a
219
217
      password request.
220
218
    </para>
 
219
    <xi:include href="../bugs.xml"/>
221
220
  </refsect1>
222
221
  
223
222
  <refsect1 id="example">
281
280
    <para>
282
281
      <citerefentry><refentrytitle>intro</refentrytitle>
283
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
284
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
285
 
      <manvolnum>5</manvolnum></citerefentry>,
286
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
287
284
      <manvolnum>7</manvolnum></citerefentry>,
288
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>