# HG changeset patch
# User Richard Dunbar <mojo@slitaz.org>
# Date 1423342156 18000
# Node ID 19cbb42ff3227d135f37363bf55dcead5a013980
# Parent  8a6c5a33f76ee3c67e0e9113f43b9a6aaa32bd3f
system.sh: revert commit 378 restores swap activation

diff -r 8a6c5a33f76e -r 19cbb42ff322 etc/init.d/system.sh
--- a/etc/init.d/system.sh	Sun Jan 11 11:12:35 2015 +0100
+++ b/etc/init.d/system.sh	Sat Feb 07 15:49:16 2015 -0500
@@ -60,20 +60,19 @@
 fi
 
 # Activate an eventual swap file or partition
+if [ "$(blkid | grep 'TYPE="swap"')" ]; then
+	for swd in $(blkid | sed '/TYPE="swap"/!d;s/:.*//'); do
+		if ! grep -q "$swd	" /etc/fstab; then
+			echo "Swap memory detected on: $swd"
+		cat >> /etc/fstab <<EOT
+$swd	swap	swap	defaults	0 0
+EOT
+		fi
+	done
+fi
 if grep -q swap /etc/fstab; then
 	echo -n "Activating swap memory..."
 	swapon -a && status
-else
-	if [ "$(blkid | grep 'TYPE="swap"')" ]; then
-		for swd in $(blkid | sed '/TYPE="swap"/!d;s/:.*//'); do
-			if ! grep -q "$swd	" /etc/fstab; then
-				echo "Swap memory detected on: $swd"
-				cat >> /etc/fstab <<EOT
-$swd	swap	swap	defaults	0 0
-EOT
-			fi
-		done
-	fi
 fi
 
 # Start TazPanel