[gentoo-commits] gentoo-x86 commit in sys-process/acct/files: acct.logrotate acct.logrotate-r1 acct.initd acct.initd-r1

[Jeroen Roovers (jer)]

jer         11/01/26 05:36:22

  Modified:             acct.logrotate acct.initd
  Added:                acct.logrotate-r1 acct.initd-r1
  Log:
  Make logrotate script compatible with both baselayout 1 and 2, by Eugeny Shkrigunov (bug #351428), patches by Robert Trace.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux i686)

Revision  Changes    Path
1.4                  sys-process/acct/files/acct.logrotate

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.logrotate?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.logrotate?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.logrotate?r1=1.3&r2=1.4

Index: acct.logrotate
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acct.logrotate	15 Nov 2010 15:00:59 -0000	1.3
+++ acct.logrotate	26 Jan 2011 05:36:22 -0000	1.4
@@ -1,11 +1,6 @@
 # Logrotate file for acct
  
 /var/account/pacct {
-	prerotate
-		if [ -h /lib/rc/init.d/started/acct ]; then
-			 /etc/init.d/acct stop > /dev/null 2>&1 || true
-		fi
-	endscript
 	compress
 	delaycompress
 	notifempty
@@ -14,8 +9,6 @@
 	create 0600 root root
 	missingok
 	postrotate
-		if [ -h /lib/rc/init.d/started/acct ]; then
-			 /etc/init.d/acct start > /dev/null 2>&1 || true
-		fi
+		/etc/init.d/acct reload > /dev/null 2>&1	
 	endscript
 }	 



1.2                  sys-process/acct/files/acct.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.initd?r1=1.1&r2=1.2

Index: acct.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acct.initd	28 Apr 2010 19:32:40 -0000	1.1
+++ acct.initd	26 Jan 2011 05:36:22 -0000	1.2
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v 1.1 2010/04/28 19:32:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v 1.2 2011/01/26 05:36:22 jer Exp $
 
-opts="report"
+opts="report reload"
 
 depend() {
     need localmount
@@ -36,4 +36,10 @@
 	sa ${REPORT_OPTS} "${ACCT_LOG}"
 }
 
+reload() {
+	service_started "${SVCNAME}" || return
+	svc_stop
+	svc_start
+}
+
 # vim:ts=4 sw=4:



1.1                  sys-process/acct/files/acct.logrotate-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.logrotate-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.logrotate-r1?rev=1.1&content-type=text/plain

Index: acct.logrotate-r1
===================================================================
# Logrotate file for acct
 
/var/account/pacct {
	compress
	delaycompress
	notifempty
	daily
	rotate 31
	create 0600 root root
	missingok
	postrotate
		/etc/init.d/acct reload > /dev/null 2>&1	
	endscript
}	 



1.1                  sys-process/acct/files/acct.initd-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.initd-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/acct/files/acct.initd-r1?rev=1.1&content-type=text/plain

Index: acct.initd-r1
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd-r1,v 1.1 2011/01/26 05:36:22 jer Exp $

opts="report reload"

depend() {
    need localmount
}

checkconfig() {
	export ACCT_LOG=${ACCT_LOG:-/var/account/pacct}
	if [[ ! -e ${ACCT_LOG} ]] ; then
		touch "${ACCT_LOG}"
		chmod 600 "${ACCT_LOG}"
	fi
	return 0
}

start() {
	checkconfig || return 1

	ebegin "Starting accounting"
	accton "${ACCT_LOG}"
	eend $?
}

stop() {
	ebegin "Stopping accounting"
	accton off
	eend $?
}

report() {
	sa ${REPORT_OPTS} "${ACCT_LOG}"
}

reload() {
	service_started "${SVCNAME}" || return
	svc_stop
	svc_start
}

# vim:ts=4 sw=4: