[gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/5-stable: rsyslog.initd

[Alexys Jacob (ultrabug)]

ultrabug    11/09/05 09:25:41

  Modified:             rsyslog.initd
  Log:
  Init script handles baselayout 1 & 2, fix #373913. Version bump wrt #381637, drop old. Add optional zeromq support to rsyslog.
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-admin/rsyslog/files/5-stable/rsyslog.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?r1=1.1&r2=1.2

Index: rsyslog.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.initd	21 Oct 2010 07:38:29 -0000	1.1
+++ rsyslog.initd	5 Sep 2011 09:25:41 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
 
 opts="reload"
 
@@ -31,8 +31,13 @@
 		return 1
 	fi
 
+	# Baselayout-1 users still use --stop and --oknodo
+	local USEROPT="--name rsyslogd"
+	if [ ! -f /etc/init.d/sysfs ]; then
+		USEROPT="--stop --oknodo"
+	fi
+
 	ebegin "Re-opening rsyslogd log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--pidfile "${PIDFILE}"
+	start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT}
 	eend $?
 }