[SCM] Debian Live initramfs hook branch, master, updated. 1.157.1-1-7-g2b0a9d5

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 2b0a9d502883a6d6143644f772fcc4546deec54d
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 9 09:51:12 2009 +0200

    Making sure that old swap entries are removed before new ones are added.

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index be78e77..22c11a0 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -77,12 +77,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
 

-- 
Debian Live initramfs hook