X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=7f43937e97106f46612b3fffeaeccf58e92f86b9;hb=8b51f6996425b853e0d0dae42a34aa1be4d37901;hp=31e1e72ad3166a83c90e252250589a0877094a72;hpb=e66f79476042794195978ee641aa7ea0d9ca6e0a;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 31e1e72..7f43937 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -32,19 +32,6 @@ log_begin_msg "Configuring fstab"
 
 # 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}"
-then
-
-cat > ${FSTAB} << EOF
-# /etc/fstab: static file system information.
-#
-# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-
-EOF
-
-fi
-
 if ! grep -qs  "^${UNIONTYPE}" "${FSTAB}"
 then
 	echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${FSTAB}"
@@ -66,15 +53,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