From d834f110aab0b46faa00b7210fdada2a83bd5f86 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 9 Apr 2009 09:51:12 +0200
Subject: [PATCH] Making sure that old swap entries are removed before new ones
 are added.

---
 scripts/live-bottom/12fstab | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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
 
-- 
2.1.4