From: Daniel Baumann <daniel@debian.org>
Date: Thu, 9 Apr 2009 07:51:12 +0000 (+0200)
Subject: Making sure that old swap entries are removed before new ones are added.
X-Git-Tag: debian/1.157.2-1~4
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=d834f110aab0b46faa00b7210fdada2a83bd5f86;p=live-boot-grml.git

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