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

[Tobias Powalowski]

    Date: Saturday, May 12, 2007 @ 08:55:37
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/initscripts

Modified: PKGBUILD (1.170 -> 1.171) netfs (1.6 -> 1.7)
          rc.sysinit (1.105 -> 1.106)

'upgpkg: bump to Duke and cleanup rc.sysinit and netds'


------------+
 PKGBUILD   |   29 +++++++++++++++++++----------
 netfs      |    4 ++--
 rc.sysinit |   11 ++++++-----
 3 files changed, 27 insertions(+), 17 deletions(-)


Index: arch/build/base/initscripts/PKGBUILD
diff -u arch/build/base/initscripts/PKGBUILD:1.170 arch/build/base/initscripts/PKGBUILD:1.171
--- arch/build/base/initscripts/PKGBUILD:1.170	Wed May  9 20:18:05 2007
+++ arch/build/base/initscripts/PKGBUILD	Sat May 12 08:55:37 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.170 2007/05/10 00:18:05 james Exp $
+# $Id: PKGBUILD,v 1.171 2007/05/12 12:55:37 tpowa Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=initscripts
 pkgver=0.8
-pkgrel=8
+pkgrel=9
 pkgdesc="System initialization/bootup scripts"
 arch=(i686 x86_64)
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
@@ -10,6 +10,23 @@
 source=(functions inittab rc.conf rc.local rc.multi rc.shutdown \
         rc.single rc.sysinit network minilogd.c isatty.c netfs makedevs \
         netcfg profile-template rc.local.shutdown)
+md5sums=('ec6e98cf3d2e4dfe588175a61015058c'
+         'b1d53aba3997e2a85cc887da45ec8c0f'
+         '9151763518526dffe33a2483b2e9dec3'
+         'bd236a57bc00aa4727b98c5ae401c457'
+         '3c1f9e4cadc877a0ac65de18b0b7df2c'
+         '916fcfb9277f2188322b5bf9737810a0'
+         'df82de02bc276ed82ead63e776406602'
+         '9fef81ecd471c72e32570100258b0eed'
+         'af0896125a451c16cda0b18b416784b9'
+         'f638d2a7ecbdb1d0207023ef41621586'
+         'fba6fca3508578fc8b3c0ae1dd509373'
+         '2bc1bca82224a3ede43506d55dd592a9'
+         '324f1d8e26d31af0edb172319b839f82'
+         '2d308ca2e8efd2d3e9b217575db03390'
+         'c1051c3e6fc2accd0d942c246e14a260'
+         '669ce6d766dd9deb86686219f3763fe4')
+
 build() {
   mkdir -p $startdir/pkg/etc/{rc.d,conf.d}
   install -D -m644 functions $startdir/pkg/etc/rc.d/functions
@@ -28,11 +45,3 @@
   install -D -m755 makedevs $startdir/pkg/sbin/makedevs
   install -D -m600 profile-template $startdir/pkg/etc/network-profiles/template
 }
-md5sums=('ec6e98cf3d2e4dfe588175a61015058c' 'b1d53aba3997e2a85cc887da45ec8c0f'\
-         '9151763518526dffe33a2483b2e9dec3' 'bd236a57bc00aa4727b98c5ae401c457'\
-         '3c1f9e4cadc877a0ac65de18b0b7df2c' '916fcfb9277f2188322b5bf9737810a0'\
-         'df82de02bc276ed82ead63e776406602' '4148312cd768bd56b73ed06f206ebdcc'\
-         'af0896125a451c16cda0b18b416784b9' 'f638d2a7ecbdb1d0207023ef41621586'\
-         'fba6fca3508578fc8b3c0ae1dd509373' '9ba9d13c648bc3e0fb4e2740e97cecff'\
-         '324f1d8e26d31af0edb172319b839f82' '2d308ca2e8efd2d3e9b217575db03390'\
-         'c1051c3e6fc2accd0d942c246e14a260' '669ce6d766dd9deb86686219f3763fe4')
Index: arch/build/base/initscripts/netfs
diff -u arch/build/base/initscripts/netfs:1.6 arch/build/base/initscripts/netfs:1.7
--- arch/build/base/initscripts/netfs:1.6	Tue Jul 25 18:36:42 2006
+++ arch/build/base/initscripts/netfs	Sat May 12 08:55:37 2007
@@ -6,7 +6,7 @@
 case "$1" in
 	start)
 		stat_busy "Mounting Network Filesystems"
-		/bin/mount -a -t nfs,smbfs,codafs,cifs,shfs,fuse
+		/bin/mount -a -t nfs,smbfs,codafs,cifs,shfs,fuse,fuseblk
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
@@ -16,7 +16,7 @@
 		;;
 	stop)
 		stat_busy "Unmounting Network Filesystems"
-		umount -a -t nfs,smbfs,codafs,cifs,shfs,fuse
+		umount -a -t nfs,smbfs,codafs,cifs,shfs,fuse,fuseblk
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
Index: arch/build/base/initscripts/rc.sysinit
diff -u arch/build/base/initscripts/rc.sysinit:1.105 arch/build/base/initscripts/rc.sysinit:1.106
--- arch/build/base/initscripts/rc.sysinit:1.105	Sun Apr 22 09:37:53 2007
+++ arch/build/base/initscripts/rc.sysinit	Sat May 12 08:55:37 2007
@@ -7,7 +7,7 @@
 . /etc/rc.d/functions
 
 echo " "
-printhl "Arch Linux v0.8 $C_OTHER(${C_H2}Voodoo$C_OTHER)\n"
+printhl "Arch Linux $C_OTHER(${C_H2}Duke$C_OTHER)\n"
 printhl "${C_H2}http://www.archlinux.org"
 printhl "Copyright 2002-2007 Judd Vinet"
 printhl "Distributed under the GNU General Public License (GPL)"
@@ -28,7 +28,7 @@
 fi
 
 # mount /sys
-grep -qw sysfs /proc/filesystems && mount -n -t sysfs none /sys
+mount -n -t sysfs none /sys
 # mount usbfs  
 /sbin/modprobe usbcore >/dev/null 2>&1
 grep -qw usbfs /proc/filesystems && mount -n -t usbfs none /proc/bus/usb
@@ -188,7 +188,7 @@
 
 FORCEFSCK=
 [ -f /forcefsck ] && FORCEFSCK="-- -f"
-NETFS="nonfs,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,nousbfs,noshfs,nofuse"
+NETFS="nonfs,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,nousbfs,noshfs,nofuse,nofuseblk"
 
 if [ -x /sbin/fsck ]; then
 	stat_busy "Checking Filesystems"
@@ -239,8 +239,9 @@
 /bin/mount -o remount,rw /
 # re-mount /proc , /sys  and usbfs so they can be written to /etc/mtab
 umount /proc/bus/usb
-umount /proc && mount -t proc none /proc
-grep -qw sysfs /proc/filesystems && umount /sys && mount -t sysfs none /sys
+if [ -e /proc/mounts ]; then
+	grep -e "/proc " -e "/sys " -e "/dev " /proc/mounts >> /etc/mtab
+fi
 if grep -qw usbfs /proc/filesystems; then
 	# Some people use custom permissions for their usbfs
 	if grep -qw /proc/bus/usb /etc/fstab; then