diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-03-06 16:55:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 16:55:26 +0100 |
| commit | 219b247e5b2eb60f01087b7d2d82ae60706e0254 (patch) | |
| tree | c5fde96c0a819fdcde2b16ac74e350d1d1c24ca9 /nixos | |
| parent | 2c05b5ee20158ac7c112959e7403ade46980cbb4 (diff) | |
| parent | 839a37fdd24d66b04fc8bd634ffab17598ec485c (diff) | |
| download | nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar.gz nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar.bz2 nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar.lz nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar.xz nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.tar.zst nixpkgs-219b247e5b2eb60f01087b7d2d82ae60706e0254.zip | |
Merge pull request #56607 from andir/cryptsetup-2.1
cryptsetup: 2.0.6 -> 2.1.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/installer.nix | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 2553a0d116a..5e363f5d09e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -273,6 +273,37 @@ let }; }; + makeLuksRootTest = name: luksFormatOpts: makeInstallerTest "luksroot-format2" + { 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 1024M -1s", # LUKS + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "modprobe dm_mod dm_crypt", + "echo -n supersecret | cryptsetup luksFormat ${luksFormatOpts} -q /dev/vda3 -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda3 cryptroot", + "mkfs.ext3 -L nixos /dev/mapper/cryptroot", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + ); + ''; + extraConfig = '' + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + ''; + enableOCR = true; + preBootCommands = '' + $machine->start; + $machine->waitForText(qr/Passphrase for/); + $machine->sendChars("supersecret\n"); + ''; + }; + in { @@ -446,37 +477,14 @@ in { ''; }; - # Boot off an encrypted root partition - luksroot = makeInstallerTest "luksroot" - { 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 1024M -1s", # LUKS - "udevadm settle", - "mkswap /dev/vda2 -L swap", - "swapon -L swap", - "modprobe dm_mod dm_crypt", - "echo -n supersecret | cryptsetup luksFormat -q /dev/vda3 -", - "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda3 cryptroot", - "mkfs.ext3 -L nixos /dev/mapper/cryptroot", - "mount LABEL=nixos /mnt", - "mkfs.ext3 -L boot /dev/vda1", - "mkdir -p /mnt/boot", - "mount LABEL=boot /mnt/boot", - ); - ''; - extraConfig = '' - boot.kernelParams = lib.mkAfter [ "console=tty0" ]; - ''; - enableOCR = true; - preBootCommands = '' - $machine->start; - $machine->waitForText(qr/Passphrase for/); - $machine->sendChars("supersecret\n"); - ''; - }; + # Boot off an encrypted root partition with the default LUKS header format + luksroot = makeLuksRootTest "luksroot-format1" ""; + + # Boot off an encrypted root partition with LUKS1 format + luksroot-format1 = makeLuksRootTest "luksroot-format1" "--type=LUKS1"; + + # Boot off an encrypted root partition with LUKS2 format + luksroot-format2 = makeLuksRootTest "luksroot-format2" "--type=LUKS2"; # Test whether opening encrypted filesystem with keyfile # Checks for regression of missing cryptsetup, when no luks device without |