X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=ba4a7a3fcd0a4a0e45d86b2201f3b0cd173ee3d2;hb=a0e06c18ca858fccdc34f81c8798f6742a08af29;hp=cd78edfd178bf4483bb6452e4872e7130301c931;hpb=15eba58b6d201ca6881f2d96753381afc0039cc8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index cd78edf..ba4a7a3 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -19,7 +19,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 . /scripts/live-functions
 
@@ -30,7 +30,7 @@ fi
 
 log_begin_msg "Configuring fstab"
 
-# live-initramfs script
+# live-boot script
 
 # Create a fake fstab only if it doesn't exist or if its the debootstrap template
 if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
@@ -66,15 +66,7 @@ then
 			continue
 		fi
 
-		# udev (>= 146) no longer provides vol_id
-		if [ -x /lib/udev/vol_id ]
-		then
-			# lenny
-			/lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
-		else
-			# squeeze
-			/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
-		fi
+		/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
 
 		magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue