[Pkg-sysvinit-commits] r154 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-19 10:28:40 +0000 (Sat, 19 Nov 2005)
New Revision: 154

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
  * In mountall.sh, add '-e' to swapon call, to ignore missing devices
    when enabling swap.  Because of this, show error messages from
    swapon.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-19 10:21:27 UTC (rev 153)
+++ sysvinit/trunk/debian/changelog	2005-11-19 10:28:40 UTC (rev 154)
@@ -15,6 +15,9 @@
     should. (Closes: #338966, #339351)
   * Print message when hostname is set.  Use default 'localhost' if no
     hostname is set in /etc/hostname, and no current hostname is set.
+  * In mountall.sh, add '-e' to swapon call, to ignore missing devices
+    when enabling swap.  Because of this, show error messages from
+    swapon.
 
   [ Thomas Hood ]
   * Improve update-rc.d man page text.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-19 10:21:27 UTC (rev 153)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-19 10:28:40 UTC (rev 154)
@@ -81,7 +81,7 @@
 	esac
 	if [ "$doswap" = yes ]
 	then
-		swapon -a 2> /dev/null
+		swapon -a -e
 	fi
 
 	#