sdImage: use findmnt to get root device when resizing (#58059)

sdImage: use findmnt to get root device when resizing
NixOS · Sep 20, 2019 · f47ef8f · f47ef8f
2 parents d484f2b + bd7bcb5
commit f47ef8f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -174,8 +174,10 @@ in
     boot.postBootCommands = ''
       # On the first boot do some maintenance tasks
       if [ -f /nix-path-registration ]; then
+        set -euo pipefail
+        set -x
         # Figure out device names for the boot device and root filesystem.
-        rootPart=$(readlink -f /dev/disk/by-label/NIXOS_SD)
+        rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
         bootDevice=$(lsblk -npo PKNAME $rootPart)
 
         # Resize the root partition and the filesystem to fit the disk