X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=cd78edfd178bf4483bb6452e4872e7130301c931;hb=e692c692d0dc9249603d0cf9d4f10677a1ae0a9c;hp=be78e77102808a082f5c15bf8b838e907c8f4681;hpb=836bfeaa36798b065260ca0b4ecd195f5650ca66;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index be78e77..cd78edf 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -55,7 +55,7 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ -z "${NOSWAP}" ]
+if [ -n "${SWAPON}" ]
 then
 	devices=""
 
@@ -66,7 +66,15 @@ then
 			continue
 		fi
 
-		/lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
+		# 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
 
 		magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
 
@@ -77,12 +85,17 @@ then
 		fi
 	done
 
+	# Remove all auto swap entries
+	if grep -qs  "swap swap" "${FSTAB}"
+	then
+		grep -v "swap swap" "${FSTAB}" > "${FSTAB}".tmp
+		mv "${FSTAB}".tmp "${FSTAB}"
+	fi
+
+	# Add new swap entries
 	for device in ${devices}
 	do
-		if ! grep -qs  "^${device} swap" "${FSTAB}"
-		then
-			echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
-		fi
+		echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
 	done
 fi