From 1bb8542a3eee9e70b49152b28261e3ad807cabc9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 3 Jul 2008 10:47:09 +0000
Subject: initscripts: do not check for kernels <2.4 on mounting swap

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4798 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/initscripts/initscripts-1.0/mountall.sh | 14 +-------------
 meta/packages/initscripts/initscripts_1.0.bb          |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/meta/packages/initscripts/initscripts-1.0/mountall.sh b/meta/packages/initscripts/initscripts-1.0/mountall.sh
index b5cb85a1e..84227a5fe 100755
--- a/meta/packages/initscripts/initscripts-1.0/mountall.sh
+++ b/meta/packages/initscripts/initscripts-1.0/mountall.sh
@@ -27,19 +27,7 @@ kill -USR1 1
 # Execute swapon command again, in case we want to swap to
 # a file on a now mounted filesystem.
 #
-doswap=yes
-case "`uname -r`" in
-	2.[0123].*)
-		if grep -qs resync /proc/mdstat
-		then
-			doswap=no
-		fi
-		;;
-esac
-if test $doswap = yes
-then
-	swapon -a 2> /dev/null
-fi
+swapon -a 2> /dev/null
 
 : exit 0
 
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 16f987e49..9e8c8aa9c 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r110"
+PR = "r111"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
cgit v1.2.3