From 24ba7b4357721590b3ab93ad9fcaf685200f4d48 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jbj@redhat.com>
Date: Sun, 16 Aug 1998 19:45:07 +0000
Subject: Remove annoying error messages.

---
 rc.d/init.d/halt | 2 +-
 rc.d/rc.sysinit  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'rc.d')

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
-- 
cgit v1.2.1