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

  • Committer: Teddy Hogeborn
  • Date: 2019-08-24 15:33:58 UTC
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: teddy@recompile.se-20190824153358-o69zprg8yiub1t0d
mandos-monitor: Use new GLib.io_add_watch() call signature

* mandos-monitor: When calling GLib.io_add_watch(), always pass a
                  channel as the first argument instead of a file
                  descriptor, and pass priority as the second
                  argument.  This is supported by PyGObject 3.8 or
                  later.

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"
71
68
        else
72
69
            skip=$((${skip}+1))
73
70
            echo "Could not determine compression of ${imgfile}; trying to skip ${skip} bytes" >&2