Merging swap live-bottom script into fstab script; there is no other sane possibility to prevent appending again and again in persistent mode.

2 files changed, 31 insertions, 65 deletions

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
 
diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
deleted file mode 100755
index 448c90a..0000000
--- a/scripts/live-bottom/13swap
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up swap"
-
-# live-initramfs script
-
-FSTAB=/root/etc/fstab
-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
-
-log_end_msg