/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 Hogeborn
  • Date: 2017-08-20 13:54:01 UTC
  • Revision ID: teddy@recompile.se-20170820135401-nbm84h6hhyy40dr2
Bug fix: Detect failure of ssh-keyscan in mandos-keygen --password.

* mandos-keygen: Detect failure of ssh-keyscan in --password mode.

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 "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
280
288
    <para>
281
289
      <citerefentry><refentrytitle>intro</refentrytitle>
282
290
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
291
      <citerefentry><refentrytitle>crypttab</refentrytitle>
 
292
      <manvolnum>5</manvolnum></citerefentry>,
283
293
      <citerefentry><refentrytitle>fifo</refentrytitle>
284
294
      <manvolnum>7</manvolnum></citerefentry>,
285
295
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>