/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: 2024-11-15 11:02:39 UTC
  • Revision ID: teddy@recompile.se-20241115110239-1t2yh76c1ap7wlmm
mandos-keygen: Avoid comment lines from ssh-keyscan

In ssh-keyscan from OpenSSH 9.8, comment lines containing the hostname
and SSH protocol banner are emitted by to standard output.  Avoid this
by passing the "-q" (quiet) option to ssh-keyscan.

mandos-keygen: When scanning localhost for keys, try to run
"ssh-keyscan" both with and without the "-q" option.  If the "-q"
option worked, use the option also in the generated checker command.

Reported-By: bb <bb@tsufeki.eu>
Thanks: bb <bb@tsufeki.eu> for analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/usplash.xml
135
135
        <para>
136
136
          These variables will normally be inherited from
137
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
139
 
          normally have inherited them from
140
 
          <filename>/scripts/local-top/cryptroot</filename> in the
141
 
          initial <acronym>RAM</acronym> disk environment, which will
142
 
          have set them from parsing kernel arguments and
143
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
144
 
          initial RAM disk environment), which in turn will have been
145
 
          created when the initial RAM disk image was created by
146
 
          <filename
147
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
148
 
          extracting the information of the root file system from
149
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
150
140
        </para>
151
141
        <para>
152
142
          This behavior is meant to exactly mirror the behavior of
290
280
    <para>
291
281
      <citerefentry><refentrytitle>intro</refentrytitle>
292
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
293
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
294
 
      <manvolnum>5</manvolnum></citerefentry>,
295
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
296
284
      <manvolnum>7</manvolnum></citerefentry>,
297
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>