Splitting out swap handling and rewriting to a live-boot subscript.

1 files changed, 0 insertions, 39 deletions

diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
index 94adddb..848fc2f 100755
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ b/initramfs-tools/scripts/live-bottom/12fstab
@@ -44,45 +44,6 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ -n "${LIVE_SWAPON}" ]
-then
-	devices=""
-
-	for device in /dev/[sv]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
-
-		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
-
 if [ "${NOFASTBOOT}" != "true" ]
 then
 	touch root/fastboot