summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2011-09-05 09:25:41 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2011-09-05 09:25:41 +0000
commit9b3a5a13370c88895e8757e4c7da8fd277c5e294 (patch)
tree70efecf0253f7b55d672b7b18754a1a09f038825 /app-admin/rsyslog/files
parentMissing IUSE keyword masking for app-admin/rsyslog wrt net-libs/zeromq (diff)
downloadhistorical-9b3a5a13370c88895e8757e4c7da8fd277c5e294.tar.gz
historical-9b3a5a13370c88895e8757e4c7da8fd277c5e294.tar.bz2
historical-9b3a5a13370c88895e8757e4c7da8fd277c5e294.zip
Init script handles baselayout 1 & 2, fix #373913. Version bump wrt #381637, drop old. Add optional zeromq support to rsyslog.
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'app-admin/rsyslog/files')
-rw-r--r--app-admin/rsyslog/files/5-stable/rsyslog.initd13
1 files changed, 9 insertions, 4 deletions
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 68ff86c06ec8..98dee94b5fb8 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -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 @@ reload() {
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 $?
}