diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-03-05 11:51:52 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-03-05 12:16:44 +0100 |
| commit | d9c8cf40b5c920ae59a02fa2bab32e93dad33542 (patch) | |
| tree | 71526f8479a6dc6bb57d4b626a301fbbc0ce8752 /mkosi.images | |
| parent | mkosi: fix UKI addons test (diff) | |
| download | systemd-d9c8cf40b5c920ae59a02fa2bab32e93dad33542.tar.xz systemd-d9c8cf40b5c920ae59a02fa2bab32e93dad33542.zip | |
Revert "mkosi: Disable cmdline addon test for now"
Let's see if this finally works.
This reverts commit e167a8283d5964ca0f903b3e362ab7e48a1ed2ab.
Diffstat (limited to 'mkosi.images')
| -rwxr-xr-x | mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh b/mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh index 9bb246263e..07caa6817e 100755 --- a/mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh +++ b/mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh @@ -10,9 +10,12 @@ systemctl --failed --no-legend | tee /failed-services if ! systemd-detect-virt --container; then cmp /sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\1') cmp /sys/firmware/efi/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\0') - # TODO: Figure out why this is failing - # grep -q this_should_be_here /proc/cmdline - # grep -q this_should_not_be_here /proc/cmdline && exit 1 + + if command -v sbsign &>/dev/null; then + cat /proc/cmdline + grep -q this_should_be_here /proc/cmdline + (! grep -q this_should_not_be_here /proc/cmdline) + fi fi # Exit with non-zero EC if the /failed-services file is not empty (we have -e set) |