aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit4
3 files changed, 8 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 743b4f9f..c7be46e5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: inittab and /etc/rc.d scripts
Name: initscripts
-%define version 3.68
+%define version 3.69
Version: %{version}
Copyright: GPL
Group: Base
@@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
%doc sysconfig.txt
%changelog
+* Sun Aug 16 1998 Jeff Johnson <jbj@redhat.com>
+- paranoia improvements to .rhkmvtag
+- if psacct with /sbin/accton, than turn off accounting
+
* Tue Jul 7 1998 Jeff Johnson <jbj@redhat.com>
- start/stop run levels changed.
- ipx_configure/ipx_internal_net moved to /sbin.
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