X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=be78e77102808a082f5c15bf8b838e907c8f4681;hb=d073b796b2aba1a910fbaa220fc6fa251cc146d9;hp=d246a5905c34dfa1069b1d494bc36a57b95d0d67;hpb=16c64362bf6d8457b9af296ef71bc6973109b802;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index d246a59..be78e77 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -55,6 +55,37 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
+if [ -z "${NOSWAP}" ]
+then
+	devices=""
+
+	for device in /dev/[hs]d[a-z][0-9]*
+	do
+		if ! [ -b "${device}" ]
+		then
+			continue
+		fi
+
+		/lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | 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
+
+		if [ "${magic}" = "SWAPSPACE2" -o "${magic}" = "SWAP-SPACE" ]
+		then
+			#log "Found ${device}"
+			devices="${devices} ${device}"
+		fi
+	done
+
+	for device in ${devices}
+	do
+		if ! grep -qs  "^${device} swap" "${FSTAB}"
+		then
+			echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
+		fi
+	done
+fi
+
 # disabled for now
 #rm -f /root/etc/rcS.d/S*checkroot.sh