summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-02-06 20:38:22 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-02-06 20:38:22 (GMT)
commit096b016164d6231d9c323bbcfb0ac68789740ea9 (patch)
treeeea5af1294839032fe9600cc8e063c6d5bf09809
parent94cc5f59013a7701d2f0bbda912ce65b947b6f89 (diff)
downloadlinhes_pkgbuild-096b016164d6231d9c323bbcfb0ac68789740ea9.zip
linhes_pkgbuild-096b016164d6231d9c323bbcfb0ac68789740ea9.tar.gz
linhes_pkgbuild-096b016164d6231d9c323bbcfb0ac68789740ea9.tar.bz2
move netfs earlier in the shutdown to avoid long hangups
Closes FS#171
-rw-r--r--abs/core-testing/initscripts/PKGBUILD5
-rw-r--r--abs/core-testing/initscripts/rc.shutdown.patch23
2 files changed, 26 insertions, 2 deletions
diff --git a/abs/core-testing/initscripts/PKGBUILD b/abs/core-testing/initscripts/PKGBUILD
index 690ce75..f05ede8 100644
--- a/abs/core-testing/initscripts/PKGBUILD
+++ b/abs/core-testing/initscripts/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=initscripts
pkgver=2008.08
_pkgrel=1
-pkgrel=4
+pkgrel=6
pkgdesc="System initialization/bootup scripts"
arch=('i686' 'x86_64')
url="http://www.archlinux.org"
@@ -11,11 +11,12 @@ groups=('base')
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=118' 'net-tools' 'ncurses' 'kbd' 'findutils')
install=initscripts.install
-source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}-${_pkgrel}.tar.gz rc.sysinit.patch)
+source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}-${_pkgrel}.tar.gz rc.sysinit.patch rc.shutdown.patch)
md5sums=('317ddba5c41ac61905fd8289805e00cd')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}-${_pkgrel}/
patch -p0 < $startdir/src/rc.sysinit.patch
+ patch -p0 < $startdir/src/rc.shutdown.patch
DESTDIR=$startdir/pkg ./install.sh
}
diff --git a/abs/core-testing/initscripts/rc.shutdown.patch b/abs/core-testing/initscripts/rc.shutdown.patch
new file mode 100644
index 0000000..187d1b7
--- /dev/null
+++ b/abs/core-testing/initscripts/rc.shutdown.patch
@@ -0,0 +1,23 @@
+--- rc.shutdown.orig 2009-02-06 15:32:04.000000000 +0000
++++ rc.shutdown 2009-02-06 15:45:05.000000000 +0000
+@@ -22,6 +22,12 @@
+ /etc/rc.local.shutdown
+ fi
+
++#unmount network filesystems for runit
++if [ -e /var/service/netfs ]
++then
++ /etc/rc.d/netfs stop
++fi
++
+ if [ "$PREVLEVEL" = "3" -o "$PREVLEVEL" = "5" ]; then
+ # Shutdown daemons
+ let i=${#DAEMONS[@]}
+@@ -39,6 +45,7 @@
+ fi
+ fi
+
++
+ # Terminate all processes
+ stat_busy "Sending SIGTERM To Processes"
+ /sbin/killall5 -15 &> /dev/null