[Pkg-sysvinit-commits] r1367 - in sysvinit/trunk/debian: . initscripts/lib/init

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-01 18:05:00 +0000 (Wed, 01 Jul 2009)
New Revision: 1367

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/lib/init/vars.sh
Log:
Make sure only noswap kernel option disable swap (Closes: #523346).
Patch from Michael Tokarev.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-06-29 20:21:48 UTC (rev 1366)
+++ sysvinit/trunk/debian/changelog	2009-07-01 18:05:00 UTC (rev 1367)
@@ -1,3 +1,11 @@
+sysvinit (2.86.ds1-64) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Make sure only noswap kernel option disable swap (Closes: #523346).
+    Patch from Michael Tokarev.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 Jul 2009 20:04:20 +0200
+
 sysvinit (2.86.ds1-63) unstable; urgency=low
 
   [ Kel Modderman ]

Modified: sysvinit/trunk/debian/initscripts/lib/init/vars.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2009-06-29 20:21:48 UTC (rev 1366)
+++ sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2009-07-01 18:05:00 UTC (rev 1367)
@@ -6,7 +6,7 @@
 
 # check for bootoption 'noswap' and do not activate swap
 # partitions/files when it is set.
-if [ -r /proc/cmdline ] && grep -q ' noswap' /proc/cmdline ; then
+if [ -r /proc/cmdline ] && grep -qw 'noswap' /proc/cmdline ; then
     NOSWAP=yes
 else
     NOSWAP=no