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

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 9c8bfd7..7f43937 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -5,6 +5,7 @@
 # initramfs-tools header
 
 PREREQ=""
+FSTAB=/root/etc/fstab
 
 prereqs()
 {
@@ -18,20 +19,64 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring fstab..."
+if [ -n "${NOFSTAB}" ]
+then
+	exit 0
+fi
 
-# live-initramfs script
+log_begin_msg "Configuring fstab"
 
-FSTAB=/root/etc/fstab
+# live-boot script
+
+if ! grep -qs  "^${UNIONTYPE}" "${FSTAB}"
+then
+	echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${FSTAB}"
+fi
+
+if ! grep -qs "^tmpfs /tmp" "${FSTAB}"
+then
+	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
+fi
+
+if [ -n "${SWAPON}" ]
+then
+	devices=""
+
+	for device in /dev/[hs]d[a-z][0-9]*
+	do
+		if ! [ -b "${device}" ]
+		then
+			continue
+		fi
+
+		/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
 
-cat > $FSTAB <<EOF
-${UNIONTYPE} / ${UNIONTYPE} rw 0 0
-tmpfs /tmp tmpfs nosuid,nodev 0 0
-EOF
+		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
+
+	# 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
+		echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
+	done
+fi
 
 # disabled for now
 #rm -f /root/etc/rcS.d/S*checkroot.sh