/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 initramfs-unpack

  • 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:
initramfs-unpack
65
65
        elif { $catimg 2>/dev/null | lzop --test >/dev/null 2>&1;
66
66
               [ ${PIPESTATUS[-1]} -eq 0 ]; }; then
67
67
            decomp="lzop --stdout --decompress"
 
68
        elif { $catimg 2>/dev/null | zstd --test >/dev/null 2>&1;
 
69
               [ ${PIPESTATUS[-1]} -eq 0 ]; }; then
 
70
            decomp="zstdcat --stdout --decompress"
68
71
        else
69
72
            skip=$((${skip}+1))
70
73
            echo "Could not determine compression of ${imgfile}; trying to skip ${skip} bytes" >&2