# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1234805201 0
# Node ID deb719ede74fe389f57bc0907b68bd6879215b70
# Parent  328bf7e4f920223f245e1189dc73c5c25e58ed9d
Update swap in fstab

diff -r 328bf7e4f920 -r deb719ede74f etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Sun Feb 15 11:55:47 2009 +0100
+++ b/etc/init.d/bootopts.sh	Mon Feb 16 17:26:41 2009 +0000
@@ -3,6 +3,14 @@
 #
 . /etc/init.d/rc.functions
 
+# Update fstab for swapon/swapoff 
+add_swap_in_fstab()
+{
+		grep -q "$1	" /etc/fstab || cat >> /etc/fstab <<EOT
+$1	swap	swap	default	0 0
+EOT
+}
+
 # Check if swap file must be generated in /home: swap=size (Mb).
 # This option is used with home=device.
 gen_home_swap()
@@ -14,6 +22,7 @@
 		dd if=/dev/zero of=/home/swap bs=1M count=$SWAP_SIZE
 		# Make the Linux swap filesystem.
 		mkswap /home/swap
+		add_swap_in_fstab /home/swap
 	fi
 }
 
@@ -129,16 +138,16 @@
 
 # Activate an eventual swap file in /home and on local HD.
 #
-if [ -f "/home/swap" ]; then
-	echo "Activating swap (/home/swap) memory..."
-	swapon /home/swap
-fi
 if [ "`fdisk -l | grep swap`" ]; then
 	for SWAP_DEV in `fdisk -l | grep swap | awk '{ print $1 }'`; do
 		echo "Swap memory detected on: $SWAP_DEV"
-		swapon $SWAP_DEV
+		add_swap_in_fstab $SWAP_DEV
 	done
 fi
+if grep -q swap /etc/fstab; then
+	echo "Activating swap memory..."
+	swapon -a
+fi
 
 # Check for a specified locale (lang=*).
 #