[arch-commits] CVS update of arch/build/base/initscripts (PKGBUILD rc.shutdown)

[Thomas Baechler]

    Date: Sunday, May 13, 2007 @ 08:01:12
  Author: thomas
    Path: /home/cvs-arch/arch/build/base/initscripts

Modified: PKGBUILD (1.171 -> 1.172) rc.shutdown (1.30 -> 1.31)

upgpkg: initscripts 0.8-10


-------------+
 PKGBUILD    |    6 +++---
 rc.shutdown |   18 +++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)


Index: arch/build/base/initscripts/PKGBUILD
diff -u arch/build/base/initscripts/PKGBUILD:1.171 arch/build/base/initscripts/PKGBUILD:1.172
--- arch/build/base/initscripts/PKGBUILD:1.171	Sat May 12 08:55:37 2007
+++ arch/build/base/initscripts/PKGBUILD	Sun May 13 08:01:11 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.171 2007/05/12 12:55:37 tpowa Exp $
+# $Id: PKGBUILD,v 1.172 2007/05/13 12:01:11 thomas Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=initscripts
 pkgver=0.8
-pkgrel=9
+pkgrel=10
 pkgdesc="System initialization/bootup scripts"
 arch=(i686 x86_64)
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
@@ -15,7 +15,7 @@
          '9151763518526dffe33a2483b2e9dec3'
          'bd236a57bc00aa4727b98c5ae401c457'
          '3c1f9e4cadc877a0ac65de18b0b7df2c'
-         '916fcfb9277f2188322b5bf9737810a0'
+         '42367d7e023500775a6db5c738f08ff9'
          'df82de02bc276ed82ead63e776406602'
          '9fef81ecd471c72e32570100258b0eed'
          'af0896125a451c16cda0b18b416784b9'
Index: arch/build/base/initscripts/rc.shutdown
diff -u arch/build/base/initscripts/rc.shutdown:1.30 arch/build/base/initscripts/rc.shutdown:1.31
--- arch/build/base/initscripts/rc.shutdown:1.30	Mon Dec 18 16:54:53 2006
+++ arch/build/base/initscripts/rc.shutdown	Sun May 13 08:01:11 2007
@@ -77,7 +77,7 @@
 stat_done
 
 stat_busy "Unmounting Filesystems"
-/bin/umount -a
+/bin/umount -a -t noramfs,notmpfs,nosysfs,noproc
 stat_done
 
 # Kill non-root encrypted partition mappings
@@ -102,14 +102,10 @@
 fi
 
 if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then
-	if [ -d /etc/lvm -a -x /sbin/lvm ]; then
-		/bin/mount -n -t sysfs none /sys 2>/dev/null
-		if [ -d /sys/block ]; then
-			stat_busy "Deactivating LVM2 groups"
-			/sbin/lvm vgchange --ignorelockingfailure -an >/dev/null 2>&1
-			stat_done
-			umount /sys
-		fi
+	if [ -x /sbin/lvm -a -d /sys/block ]; then
+		stat_busy "Deactivating LVM2 groups"
+		/sbin/lvm vgchange --ignorelockingfailure -an >/dev/null 2>&1
+		stat_done
 	fi
 fi
 
@@ -125,8 +121,8 @@
 else
 	printsep
 	printhl "${C_H2}REBOOTING"
-	# adding kexec support
-	[ -x /usr/sbin/kexec ] && /usr/sbin/kexec -e > /dev/null 2>&1
+	# if kexec is installed and a kernel is loaded, use it
+	[ -x /sbin/kexec ] && /sbin/kexec -e > /dev/null 2>&1
 	/sbin/reboot -d -f -i
 fi