[gentoo-commits] gentoo-x86 commit in net-analyzer/smokeping/files: smokeping.init.2

[Tobias Klausmann (klausman)]

klausman    12/04/29 10:32:15

  Modified:             smokeping.init.2
  Log:
  Fix init script to not trigger warnings with newer OpenRC. Also simplify dump and restore commands (OpenRC will do these checks for us now).
  
  (Portage version: 2.1.10.57/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-analyzer/smokeping/files/smokeping.init.2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/files/smokeping.init.2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/files/smokeping.init.2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/files/smokeping.init.2?r1=1.1&r2=1.2

Index: smokeping.init.2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/files/smokeping.init.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smokeping.init.2	16 Jun 2010 18:24:17 -0000	1.1
+++ smokeping.init.2	29 Apr 2012 10:32:15 -0000	1.2
@@ -1,8 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="${opts} dump reload restore"
+extra_started_commands="reload"
+extra_stopped_commands="dump restore"
 
 depend() {
 	need net
@@ -48,10 +49,6 @@
 
 dump() {
 	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before dumping files!"
-		return 1
-	fi
 	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
 		f_xml=`dirname $f`/`basename $f .rrd`.xml
 		rrdtool dump "$f" > "${f_xml}"
@@ -62,10 +59,6 @@
 
 restore() {
 	ebegin "Restoring smokeping rrd files from XML dump files"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before restoring files!"
-		return 1
-	fi
 	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
 		f_rrd=`dirname $f`/`basename $f .xml`.rrd
 		mv -f "${f_rrd}" "${f_rrd}.bak"