Allow disabling unified kernel images on BIOS for all distros

Fixes systemd#580.
DaanDeMeyer · Dec 17, 2020 · 184a2ad · 184a2ad
1 parent c063cb8
commit 184a2ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -139,10 +139,7 @@ jobs:
       if: matrix.format != 'directory' &&
           matrix.format != 'gpt_squashfs' &&
           matrix.format != 'plain_squashfs' &&
-          matrix.format != 'tar' && (
-          matrix.distro == 'arch' ||
-          matrix.distro == 'centos' ||
-          matrix.distro == 'fedora')
+          matrix.format != 'tar'
       run: |
         tee mkosi.default << EOF
         [Distribution]
@@ -152,6 +149,7 @@ jobs:
         Format=${{ matrix.format }}
         Bootable=yes
         BootProtocols=bios
+        WithUnifiedKernelImages=no
 
         [Validation]
         Password=
@@ -166,8 +164,5 @@ jobs:
       if: matrix.format != 'directory' &&
           matrix.format != 'gpt_squashfs' &&
           matrix.format != 'plain_squashfs' &&
-          matrix.format != 'tar' && (
-          matrix.distro == 'arch' ||
-          matrix.distro == 'centos' ||
-          matrix.distro == 'fedora')
+          matrix.format != 'tar'
       run: sudo ./tests/pexpect/boot.py python3 -m mkosi qemu
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
@@ -4924,11 +4924,12 @@ def load_args(args: CommandLineArguments) -> CommandLineArguments:
     if args.bootable and args.distribution in (Distribution.clear, Distribution.photon):
         die("Sorry, --bootable is not supported on this distro")
 
-    if not args.with_unified_kernel_images and args.distribution in (Distribution.debian,
-                                                                     Distribution.ubuntu,
-                                                                     Distribution.mageia,
-                                                                     Distribution.opensuse):
-        die(f"Sorry, --without-unified-kernel-images is not supported on this distro.")
+    if not args.with_unified_kernel_images and "uefi" in args.boot_protocols:
+        if args.distribution in (Distribution.debian,
+                                 Distribution.ubuntu,
+                                 Distribution.mageia,
+                                 Distribution.opensuse):
+            die(f"Sorry, --without-unified-kernel-images is not supported in UEFI mode on this distro.")
 
     if args.verity and not args.with_unified_kernel_images:
         die("Sorry, --verity can only be used with unified kernel images")