about summary refs log tree commit diff
path: root/nixos/tests/installer.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-05-02 01:07:12 -0500
committerWilliam A. Kennington III <william@wkennington.com>2014-08-28 13:35:36 -0700
commit6549bcff9607efd68ecd8fca8ca15c4446b16fb9 (patch)
tree8733f503c82ae5611e8d4e9e8b89699d24363b02 /nixos/tests/installer.nix
parentb651097d193089d14e9407a67b95397bf02129e5 (diff)
downloadnixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar.gz
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar.bz2
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar.lz
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar.xz
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.tar.zst
nixlib-6549bcff9607efd68ecd8fca8ca15c4446b16fb9.zip
tests/installer: Fix provided test uuid and label mounts
Diffstat (limited to 'nixos/tests/installer.nix')
-rw-r--r--nixos/tests/installer.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index cb9cc1200626..d15c43d29bbe 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -421,9 +421,9 @@ in {
         "swapon -L swap",
         "mkfs.ext4 -L boot /dev/vda2",
         "mkfs.ext4 -L root /dev/vda4",
-        "mount LABEL=root /mnt",
+        "mount /dev/disk/by-label/root /mnt",
         "mkdir /mnt/boot",
-        "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\$UUID /mnt/boot"
+        "mount /dev/disk/by-uuid/\$(blkid -s UUID -o value /dev/vda2) /mnt/boot"
       );
     '';
     grubIdentifier = "provided";