diff options
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 21 |
3 files changed, 23 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 191d5044341f..2d2976ea5b7c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -56,6 +56,7 @@ in rec { (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) + (all nixos.tests.installer.separateBootFat) (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) (all nixos.tests.installer.simpleProvided) diff --git a/nixos/release.nix b/nixos/release.nix index a8b6d275f1d8..c288adfd2063 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -229,6 +229,7 @@ in rec { tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); + tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 32be1ea23b98..4da5c29ca0d3 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -254,6 +254,27 @@ in { ''; }; + # Same as the previous, but with fat32 /boot. + separateBootFat = makeInstallerTest "separateBootFat" + { createPartitions = + '' + $machine->succeed( + "parted /dev/vda mklabel msdos", + "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", + "parted /dev/vda -- mkpart primary ext2 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.ext3 -L nixos /dev/vda3", + "mount LABEL=nixos /mnt", + "mkfs.vfat -n BOOT /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=BOOT /mnt/boot", + ); + ''; + }; + # Create two physical LVM partitions combined into one volume group # that contains the logical swap and root partitions. lvm = makeInstallerTest "lvm" |