diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-30 06:30:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 06:30:05 +0200 |
| commit | 6c39b6eda2165a6039e51ea58f68383797984e25 (patch) | |
| tree | 009b316c53ae3b9ff744dcbe4a736ec5cc79d92b | |
| parent | 04e7a9405e8bcc05b51edc9cdfbf871a6ae7bb70 (diff) | |
| parent | c19234d0dff963a1d49628f648db3d618e8a9c29 (diff) | |
| download | nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar.gz nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar.bz2 nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar.lz nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar.xz nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.tar.zst nixpkgs-6c39b6eda2165a6039e51ea58f68383797984e25.zip | |
Merge pull request #147967 from Artturin/increasebootsizes
| -rw-r--r-- | nixos/tests/installer.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 513d2506e94..bc41b6efc2e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -354,8 +354,8 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M -1s", # LUKS "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -456,9 +456,9 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -483,8 +483,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -503,8 +503,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50MB 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100MB 1024M" + " mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", @@ -599,8 +599,8 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary linux-swap 50M 1024M" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" + " mkpart primary 1024M 1280M" # LUKS with keyfile + " mkpart primary 1280M -1s", "udevadm settle", @@ -674,8 +674,8 @@ in { machine.succeed( "flock /dev/vda parted --script /dev/vda --" + " mklabel msdos" - + " mkpart primary ext2 1M 50MB" # /boot - + " mkpart primary 50MB 512MB " # swap + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary 100MB 512MB " # swap + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) "modprobe bcache", |