diff --git a/man/ukify.xml b/man/ukify.xml index 098dacfb99f..b2e7f82d8fe 100644 --- a/man/ukify.xml +++ b/man/ukify.xml @@ -415,7 +415,7 @@ All the bells and whistles - # /usr/lib/systemd/ukify build \ + $ /usr/lib/systemd/ukify build \ --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \ --initrd=early_cpio \ --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img \ @@ -472,7 +472,7 @@ Phases=enter-initrd:leave-initrd enter-initrd:leave-initrd:sysinit enter-initrd:leave-initrd:sysinit:ready -# /usr/lib/systemd/ukify -c ukify.conf build \ +$ /usr/lib/systemd/ukify -c ukify.conf build \ --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \ --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py index eae82c7f88f..5829bae6985 100755 --- a/src/ukify/test/test_ukify.py +++ b/src/ukify/test/test_ukify.py @@ -588,7 +588,7 @@ def test_pcr_signing(kernel_initrd, tmpdir): '--uname=1.2.3', '--cmdline=ARG1 ARG2 ARG3', '--os-release=ID=foobar\n', - '--pcr-banks=sha1', # use sha1 as that is most likely to be supported + '--pcr-banks=sha1', # use sha1 because it doesn't really matter f'--pcrpkey={pub.name}', f'--pcr-public-key={pub.name}', f'--pcr-private-key={priv.name}', @@ -655,7 +655,7 @@ def test_pcr_signing2(kernel_initrd, tmpdir): '--uname=1.2.3', '--cmdline=ARG1 ARG2 ARG3', '--os-release=ID=foobar\n', - '--pcr-banks=sha1', # use sha1 as that is most likely to be supported + '--pcr-banks=sha1', f'--pcrpkey={pub2.name}', f'--pcr-public-key={pub.name}', f'--pcr-private-key={priv.name}',