public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/5-stable: rsyslog.initd
@ 2011-09-05  9:25 Alexys Jacob (ultrabug)
  0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob (ultrabug) @ 2011-09-05  9:25 UTC (permalink / raw
  To: gentoo-commits

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 $?
 }






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/5-stable: rsyslog.initd
@ 2012-01-16  7:57 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-01-16  7:57 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/01/16 07:57:47

  Modified:             rsyslog.initd
  Log:
  Fix initscript to not use deprecated opts. Use ssl useflag not gnutls for ssl support as ssl should enable the ssl support and gnutls/openssl respective features if multiple backends are available.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?r1=1.2&r2=1.3

Index: rsyslog.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rsyslog.initd	5 Sep 2011 09:25:41 -0000	1.2
+++ rsyslog.initd	16 Jan 2012 07:57:47 -0000	1.3
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/09/05 09:25:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $
 
-opts="reload"
+extra_started_commands="reload"
 
 depend() {
 	provide logger






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/5-stable: rsyslog.initd
@ 2012-08-24 14:40 Alexys Jacob (ultrabug)
  0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob (ultrabug) @ 2012-08-24 14:40 UTC (permalink / raw
  To: gentoo-commits

ultrabug    12/08/24 14:40:14

  Modified:             rsyslog.initd
  Log:
  Fix init scripts #432548 thx to zunkree
  
  (Portage version: 2.1.11.10/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd?r1=1.3&r2=1.4

Index: rsyslog.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsyslog.initd	16 Jan 2012 07:57:47 -0000	1.3
+++ rsyslog.initd	24 Aug 2012 14:40:14 -0000	1.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 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.3 2012/01/16 07:57:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.4 2012/08/24 14:40:14 ultrabug Exp $
 
 extra_started_commands="reload"
 
@@ -12,7 +12,7 @@
 start() {
 	ebegin "Starting rsyslogd"
 	start-stop-daemon \
-		--start --quiet --exec /usr/sbin/rsyslogd \
+		--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" \
 		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
 	eend $?
 }





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-08-24 14:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-16  7:57 [gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/5-stable: rsyslog.initd Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2012-08-24 14:40 Alexys Jacob (ultrabug)
2011-09-05  9:25 Alexys Jacob (ultrabug)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox