From 2befb404428d34aa42c5e2893899325e041995af Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 10 May 2009 14:18:00 -0400 Subject: [PATCH] trymount: fixed bug in fstype detection --- initramfs/etc_rc.d_rc.trymount.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/initramfs/etc_rc.d_rc.trymount.sh b/initramfs/etc_rc.d_rc.trymount.sh index a91a6d5..3b2bbaa 100644 --- a/initramfs/etc_rc.d_rc.trymount.sh +++ b/initramfs/etc_rc.d_rc.trymount.sh @@ -54,16 +54,18 @@ elif [ -n "$root" ]; then find) # UUID= or LABEL= root_tag="$root" root=$(blkid -l -o device -t "$root_tag") - [ -z "$root" ] || root_type=$(blkid -l -o value -t TYPE "$root") + [ -z "$root" ] || root_type=$(blkid -o value -s TYPE "$root") [ -z "$root_type" ] || root_tag="$root_tag, $root_type" ;; device) - root_type=$(blkid -l -o value -t TYPE "$root") + root_type=$(blkid -o value -s TYPE "$root") ;; esac if [ -z "$root" ]; then title "Mounting $root_tag at $rootfs." + elif [ -z "$root_type" ]; then + title "Mounting $root (undetermined) at $rootfs." elif [ -z "$root_tag" ]; then title "Mounting $root ($root_type) at $rootfs." else