- use /etc/rc.d/rc.acct for accouting; updated accouting related parts of translation...

svn-id: @1434

diff --git a/po/de.po b/po/de.po
index a36c87ac7bcbea45b5a9c542f1c2f0c43098017a..d1e9fc10df71d0c37d434dfc11379c7061bb8148 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -125,7 +125,7 @@ msgstr "INIT wird befehlt, in den Single-Modus zu gehen"
 
 #: ../rc.d/rc.shutdown:32
 msgid "Turning off swap and accounting"
-msgstr "Die Auslagerung und das Protokollieren werden ausgeschaltet"
+msgstr "Die Auslagerung wird ausgeschaltet"
 
 #: ../rc.d/rc.shutdown:42 ../rc.d/rc.sysinit:190 ../rc.d/rc.sysinit:346
 #: ../rc.d/rc.sysinit:375

diff --git a/po/pl.po b/po/pl.po
index 12f1c8c2a64577d6e68ea5fe94efd539209e28cc..73a977aa93315bfa81948f32df690d1173503e9a 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -58,8 +58,8 @@ msgid "Sending all processes the KILL signal"
 msgstr "Wysylanie do wszystkich procesów sygnalu KILL"
 
 #: ./rc.d/rc.shutdown:32
-msgid "Turning off swap and accounting"
-msgstr "Wylaczanie swapa i zliczania"
+msgid "Turning off swap"
+msgstr "Wylaczanie swapa"
 
 #: ./rc.d/rc.shutdown:36
 msgid "Turning off quotas for local filesystems"
@@ -283,10 +283,6 @@ msgstr "Sprawdzanie quot w systemach plik
 msgid "Turning on quotas for local filesystems"
 msgstr "Wlaczanie quot na lokalnych systemach plików"
 
-#: ./rc.d/rc.sysinit:542
-msgid "Turning on process accounting"
-msgstr "Wlaczanie zliczania procesów"
-
 #: ./rc.d/rc.sysinit:558
 msgid "Setting %s seconds for kernel reboot after panic"
 msgstr "Restart systemu po %s sekundach od zawieszenia sie jadra"

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index 80490cd3a9cb1d1cc36b641616932a83e93a4178..3ac5aa696b43e142e450f49edf5e607f09e710e9 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -29,8 +29,9 @@ run_cmd "Sending all processes the KILL signal" killall5 -9
 halt -w
 
 # Turn off swap, then unmount file systems.
-run_cmd "Turning off swap and accounting" swapoff -a
-[ -x /sbin/accton ] && LC_ALL=C /sbin/accton 2>&1 | grep -v "not implemented"
+run_cmd "Turning off swap" swapoff -a
+
+[ -x /etc/rc.d/rc.acct ] && /etc/rc.d/rc.acct stop
 
 if [ -x /sbin/quotaoff ]; then
        run_cmd "Turning off quotas for local filesystems" /sbin/quotaoff -a

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 4b9745b353d2f7c7616f1eec99510a32995cdad5..8e1760633045cc4f502c94a021f1ef44a5ac95d3 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -610,8 +610,8 @@ if [ -x /sbin/quotaon ]; then
 fi
 
 # Turn on process accounting
-if [ -x /sbin/accton ] ; then
-        run_cmd "Turning on process accounting" /sbin/accton /var/log/pacct
+if [ -x /etc/rc.d/rc.acct ]; then
+       /etc.rc.d/rc.acct start
 fi
 
 # Set the clock if timezone definition wasn't available (eg. /usr not mounted)