aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike A. Harris <mharris@redhat.com>2002-03-12 11:56:16 +0000
committerMike A. Harris <mharris@redhat.com>2002-03-12 11:56:16 +0000
commit3c8bf819778831e628467c5d5f4727240c588229 (patch)
tree322ed0062e62d4250fae266368f57c125492c5bc
parent5473ffcdc6afc4a3fb56fb0019e3b34854be9a3d (diff)
downloadinitscripts-3c8bf819778831e628467c5d5f4727240c588229.tar
initscripts-3c8bf819778831e628467c5d5f4727240c588229.tar.gz
initscripts-3c8bf819778831e628467c5d5f4727240c588229.tar.bz2
initscripts-3c8bf819778831e628467c5d5f4727240c588229.tar.xz
initscripts-3c8bf819778831e628467c5d5f4727240c588229.zip
removed accton calls from rc.sysinit and halt scripts as it is handled in psacct package nowr6-55
-rw-r--r--ChangeLog6
-rw-r--r--initscripts.spec6
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit5
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 73327206..ade21ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-12 Mike A. Harris <mharris@redhat.com>
+
+ * rc.sysinit, /etc/rc.d/init.d/halt: 6.55-1
+ Removed process accounting enable/disable, as it is now handled
+ in the psacct package by a standalone initscript
+
2002-03-01 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec: 6.54-1
diff --git a/initscripts.spec b/initscripts.spec
index 8fb7877f..45805ed7 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 6.54
+Version: 6.55
License: GPL
Group: System Environment/Base
Release: 1
@@ -242,6 +242,10 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Tue Mar 12 2002 Mike A. Harris <mharris@redhat.com> 6.55-1
+- Removed process accounting stuff from rc.sysinit and halt scripts as it is
+ now handled by the psacct initscript in the psacct package
+
* Thu Feb 28 2002 Bill Nottingham <notting@redhat.com>
- conflict with older psacct
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 97dc4b78..0df6983f 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -121,8 +121,6 @@ runcmd $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps`
[ -n "$SWAPS" ] && runcmd $"Turning off swap: " swapoff $SWAPS
-[ -x /sbin/accton ] && runcmd $"Turning off accounting: " /sbin/accton
-
[ -x /sbin/quotaoff ] && runcmd $"Turning off quotas: " /sbin/quotaoff -aug
# Unmount file systems, killing processes if we have to.
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 48300a82..0555ae88 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -603,11 +603,6 @@ if [ -x /sbin/quotaon ]; then
action $"Enabling local filesystem quotas: " /sbin/quotaon -aug
fi
-# Turn on process accounting
-if [ -x /sbin/accton ] ; then
- action $"Turning on process accounting" /sbin/accton /var/account/pacct
-fi
-
# Configure machine if necessary.
if [ -f /.unconfigured ]; then
if [ -x /usr/bin/passwd ]; then