summary refs log tree commit diff
path: root/nixos/tests/installer.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-11-19 22:54:35 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-11-19 22:55:12 +0100
commitaedba5c2af3e545ed717e4c66a4bbbaacf9cf44a (patch)
treec043edf668a6359644457a296d6058b07c714647 /nixos/tests/installer.nix
parentbf338ab9ee252b63dfcaa89db9ab7908dcb433a3 (diff)
downloadnixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar.gz
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar.bz2
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar.lz
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar.xz
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.tar.zst
nixpkgs-aedba5c2af3e545ed717e4c66a4bbbaacf9cf44a.zip
nixos: run parted with --script option (3rd)
Doh, should have included this in previous commit.

Ref. 0ff4bb5f875afe8eb208bbabb3f52dc29539d2bc
("nixos: run parted with --script option").
Diffstat (limited to 'nixos/tests/installer.nix')
-rw-r--r--nixos/tests/installer.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 1fe78feceaa..6c7fd6c575b 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -467,11 +467,11 @@ in {
   filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile"
     { createPartitions = ''
        $machine->succeed(
-          "parted /dev/vda mklabel msdos",
-          "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-          "parted /dev/vda -- mkpart primary linux-swap 50M 1024M",
-          "parted /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile
-          "parted /dev/vda -- mkpart primary 1280M -1s",
+          "parted --script /dev/vda mklabel msdos",
+          "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+          "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
+          "parted --script /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile
+          "parted --script /dev/vda -- mkpart primary 1280M -1s",
           "udevadm settle",
           "mkswap /dev/vda2 -L swap",
           "swapon -L swap",