summaryrefslogtreecommitdiff
path: root/releng
diff options
context:
space:
mode:
Diffstat (limited to 'releng')
-rwxr-xr-xreleng/airootfs/usr/share/calamares/kernel-install/95-raveos.install6
1 files changed, 4 insertions, 2 deletions
diff --git a/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install b/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
index 4bb0c6b..94b4330 100755
--- a/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
+++ b/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
@@ -34,8 +34,10 @@ else
[ -f "$BOOT_ROOT/amd-ucode.img" ] && MICROCODE="/amd-ucode.img"
fi
-# Root device detection with fallback
-ROOT_SRC="$(findmnt -no SOURCE / || true)"
+# Root device detection with fallback.
+# findmnt prints btrfs mounts as "/dev/vda2[/@]" (device plus subvolume),
+# which is not a valid device node for blkid/mount -- strip the bracket part.
+ROOT_SRC="$(findmnt -no SOURCE / | sed 's/\[.*\]//' || true)"
ROOT_FS="$(findmnt -no FSTYPE / || true)"
ROOT_OPTS="$(findmnt -no OPTIONS / || true)"