# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1349097059 -7200
# Node ID b08c444c567515e6161915340aa4151a3fb83adc
# Parent  3dd56819a891fb8b8ba0326110701fda34bc1eab
system.sh: do not trust id for swap

diff -r 3dd56819a891 -r b08c444c5675 etc/init.d/system.sh
--- a/etc/init.d/system.sh	Tue Sep 11 08:56:08 2012 +0200
+++ b/etc/init.d/system.sh	Mon Oct 01 15:10:59 2012 +0200
@@ -104,8 +104,8 @@
 fi
 
 # Activate an eventual swap file or partition
-if [ "$(fdisk -l | grep swap)" ]; then
-	for swd in $(fdisk -l | sed '/swap/!d;s/ .*//'); do
+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