diff options
| author | Judd Vinet <judd@archlinux.org> | 2006-11-08 20:01:06 +0000 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2006-11-08 20:01:06 +0000 |
| commit | ef6a41ebd7e2ab216e4b950df2a6d0826aef39b7 (patch) | |
| tree | 1009a44299771f0fc03e72c2b926edab60cf4afa | |
| parent | 01f15f89c1cf4cdb77c7d0a8ddb37ddabd7df012 (diff) | |
| download | initscripts-ef6a41ebd7e2ab216e4b950df2a6d0826aef39b7.tar.xz | |
patch from Paul to disable NIS domainname before shutting down (syslog-ng was hanging). Also added a 2>/dev/null to fsck during startup
| -rwxr-xr-x | rc.shutdown | 5 | ||||
| -rwxr-xr-x | rc.sysinit | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/rc.shutdown b/rc.shutdown index aae042e..d0a094e 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -13,6 +13,11 @@ echo " " printhl "Initiating Shutdown..." echo " " +# avoid NIS hanging syslog-ng on shutdown by unsetting the domainname +if [ -x /bin/domainname ]; then + /bin/domainname "" +fi + if [ -x /etc/rc.local.shutdown ]; then /etc/rc.local.shutdown fi @@ -137,7 +137,7 @@ if [ -x /sbin/fsck ]; then if [ "`cat /proc/cmdline | grep quiet`" ]; then /sbin/fsck -A -T -C -a -t $NETFS $FORCEFSCK >/dev/null 2>&1 else - /sbin/fsck -A -T -C -a -t $NETFS $FORCEFSCK + /sbin/fsck -A -T -C -a -t $NETFS $FORCEFSCK 2>/dev/null fi if [ $? -gt 1 ]; then stat_fail |