summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2014-08-22 10:31:59 +0000
committerYixun Lan <dlan@gentoo.org>2014-08-22 10:31:59 +0000
commit59eeb0f083611e5074e1f75e4d5be443c7d2c4c8 (patch)
tree52898ee8d50e11e9a451d2cf0b51094b04674204 /app-admin
parentremove old unviable version (diff)
downloadgentoo-2-59eeb0f083611e5074e1f75e4d5be443c7d2c4c8.tar.gz
gentoo-2-59eeb0f083611e5074e1f75e4d5be443c7d2c4c8.tar.bz2
gentoo-2-59eeb0f083611e5074e1f75e4d5be443c7d2c4c8.zip
bug 520294, fix init script issue. proxy for itumaykin at gmail.com
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/ulogd/ChangeLog6
-rw-r--r--app-admin/ulogd/files/ulogd-2-ng.init13
-rw-r--r--app-admin/ulogd/files/ulogd-2.init13
3 files changed, 19 insertions, 13 deletions
diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 6535e7454e53..00792ee5f8fb 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/ulogd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.88 2014/07/13 10:01:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.89 2014/08/22 10:31:59 dlan Exp $
+
+ 22 Aug 2014; Yixun Lan <dlan@gentoo.org> files/ulogd-2-ng.init,
+ files/ulogd-2.init:
+ bug 520294, fix init script issue. proxy for itumaykin at gmail.com
13 Jul 2014; Agostino Sarubbo <ago@gentoo.org> ulogd-2.0.3.ebuild:
Stable for ppc, wrt bug #508846
diff --git a/app-admin/ulogd/files/ulogd-2-ng.init b/app-admin/ulogd/files/ulogd-2-ng.init
index a818ce2ab0e1..b1c5d616dc12 100644
--- a/app-admin/ulogd/files/ulogd-2-ng.init
+++ b/app-admin/ulogd/files/ulogd-2-ng.init
@@ -1,22 +1,23 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.1 2013/12/17 21:38:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.2 2014/08/22 10:31:59 dlan Exp $
ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_BINARY="/usr/sbin/ulogd"
ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
extra_started_commands="reload reopen_logs"
depend() {
- need net
+ before iptables ip6tables ebtables firewall
+ after mysql postgresql
}
start() {
ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet \
- --exec ${ULOGD_EXEC} \
+ start-stop-daemon --start \
+ --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
-- ${ULOGD_OPTS}
eend $?
}
diff --git a/app-admin/ulogd/files/ulogd-2.init b/app-admin/ulogd/files/ulogd-2.init
index 68718f3b0e85..28aa571bbbc4 100644
--- a/app-admin/ulogd/files/ulogd-2.init
+++ b/app-admin/ulogd/files/ulogd-2.init
@@ -1,25 +1,26 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.3 2014/04/27 09:57:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.4 2014/08/22 10:31:59 dlan Exp $
ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_EXEC="/usr/sbin/ulogd"
-ULOGD_OPTS="-u ulogd"
+ULOGD_BINARY="/usr/sbin/ulogd"
+ULOGD_OPTS="--uid ulogd"
extra_started_commands="reload reopen_logs"
depend() {
- need net
+ before iptables ip6tables ebtables firewall
+ after mysql postgresql
}
start() {
ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet \
+ start-stop-daemon --start \
--make-pidfile \
--pidfile ${ULOGD_PIDFILE} \
--background \
- --exec ${ULOGD_EXEC} \
+ --exec ${ULOGD_BINARY} \
-- ${ULOGD_OPTS}
eend $?
}