summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNippy <nippy@Nippy-Mac-mini.local>2026-09-26 09:50:07 +0200
committerNippy <nippy@Nippy-Mac-mini.local>2026-09-26 09:50:07 +0200
commit20afb139e4305f25bbde68f3dcd181013bcddc07 (patch)
tree7eb778c05c8ce3f5a7a3273c5d8acc174d554d50
parent7535863e74488abf0601e52fa0eb7943ea277818 (diff)
downloadRaveOS-build-iso-20afb139e4305f25bbde68f3dcd181013bcddc07.tar.gz
RaveOS-build-iso-20afb139e4305f25bbde68f3dcd181013bcddc07.zip
calamares fix
-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)"