nixos/tests: installer: restructure simple test data
This commit is contained in:
parent
7f363b034e
commit
c400ab55d6
@ -304,6 +304,22 @@ let
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# The (almost) simplest partitioning scheme: a swap partition and
|
||||||
|
# one big filesystem partition.
|
||||||
|
simple-test-config = { createPartitions =
|
||||||
|
''
|
||||||
|
$machine->succeed(
|
||||||
|
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||||
|
. " mkpart primary linux-swap 1M 1024M"
|
||||||
|
. " mkpart primary ext2 1024M -1s",
|
||||||
|
"udevadm settle",
|
||||||
|
"mkswap /dev/vda1 -L swap",
|
||||||
|
"swapon -L swap",
|
||||||
|
"mkfs.ext3 -L nixos /dev/vda2",
|
||||||
|
"mount LABEL=nixos /mnt",
|
||||||
|
);
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
@ -312,21 +328,7 @@ in {
|
|||||||
|
|
||||||
# The (almost) simplest partitioning scheme: a swap partition and
|
# The (almost) simplest partitioning scheme: a swap partition and
|
||||||
# one big filesystem partition.
|
# one big filesystem partition.
|
||||||
simple = makeInstallerTest "simple"
|
simple = makeInstallerTest "simple" simple-test-config;
|
||||||
{ createPartitions =
|
|
||||||
''
|
|
||||||
$machine->succeed(
|
|
||||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
|
||||||
. " mkpart primary linux-swap 1M 1024M"
|
|
||||||
. " mkpart primary ext2 1024M -1s",
|
|
||||||
"udevadm settle",
|
|
||||||
"mkswap /dev/vda1 -L swap",
|
|
||||||
"swapon -L swap",
|
|
||||||
"mkfs.ext3 -L nixos /dev/vda2",
|
|
||||||
"mount LABEL=nixos /mnt",
|
|
||||||
);
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
|
# Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
|
||||||
simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
|
simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user