]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Use proper check to detect whether we're in a VM
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 26 May 2023 15:38:23 +0000 (17:38 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 31 May 2023 12:19:25 +0000 (14:19 +0200)
mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh

index ae1385b98b0bc8428191effe5f627223ad7367e5..9624bc486c6a93ad2157d190051f5bc1877336a3 100755 (executable)
@@ -4,7 +4,7 @@
 systemctl --failed --no-legend | tee /failed-services
 
 # Check that secure boot keys were properly enrolled.
-if [[ -d /sys/firmware/efi/efivars/ ]]; then
+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')
     grep -q this_should_be_here /proc/cmdline