aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorJeff Johnson <jbj@redhat.com>1998-08-16 19:45:07 +0000
committerJeff Johnson <jbj@redhat.com>1998-08-16 19:45:07 +0000
commit24ba7b4357721590b3ab93ad9fcaf685200f4d48 (patch)
treee8787b6b6168a8012d81f5dfad9dc69c1221018e /rc.d
parent179d4859f9ecc23efbf46e6a04e8923aa9c5c531 (diff)
downloadinitscripts-24ba7b4357721590b3ab93ad9fcaf685200f4d48.tar
initscripts-24ba7b4357721590b3ab93ad9fcaf685200f4d48.tar.gz
initscripts-24ba7b4357721590b3ab93ad9fcaf685200f4d48.tar.bz2
initscripts-24ba7b4357721590b3ab93ad9fcaf685200f4d48.tar.xz
initscripts-24ba7b4357721590b3ab93ad9fcaf685200f4d48.zip
Remove annoying error messages.r3-69
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit4
2 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index e7ed4b31..c16b15c6 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -42,7 +42,7 @@ halt -w
# Turn off swap, then unmount file systems.
echo "Turning off swap and accounting"
swapoff -a
-accton
+[ -x /sbin/accton ] && /sbin/accton
echo "Unmounting file systems"
umount -a
mount -n -o remount,ro /
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d663ac05..e8d4e3dd 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -115,9 +115,9 @@ fi
rm -f /lib/modules/preferred
if [ -n "$USEMODULES" ]; then
ktag="`cat /proc/version`"
- mtag=`grep -l "$ktag" /lib/modules/2.0.*/.rhkmvtag`
+ mtag=`grep -l "$ktag" /lib/modules/2.0.*/.rhkmvtag` 2> /dev/null
if [ -n "$mtag" ]; then
- mver=`echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,'`
+ mver=`echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,' -e 's,[ ].*$,,'`
ln -sf /lib/modules/$mver /lib/modules/preferred
ln -sf /boot/System.map-$mver /boot/System.map
ln -sf /boot/module-info-$mver /boot/module-info