[gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/files/

[Anthony G. Basile]

commit:     21961d3fb5f34c23665d769620e0d541d953ab90
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 15:25:28 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 15:25:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=21961d3f

sys-apps/busybox: simplify the ssd logic

---
 sys-apps/busybox/files/klogd.initd    |   17 +++++------------
 sys-apps/busybox/files/ntpd.initd     |   17 +++++------------
 sys-apps/busybox/files/syslogd.initd  |   17 +++++------------
 sys-apps/busybox/files/watchdog.initd |   18 +++++-------------
 4 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
index 0a6b0d8..c34e0be 100644
--- a/sys-apps/busybox/files/klogd.initd
+++ b/sys-apps/busybox/files/klogd.initd
@@ -3,18 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
 
+command="/bin/busybox"
+command_args="${KLOGD_OPTS}"
+start_stop_daemon_args="--name klogd"
+pidfile="/var/run/${SVCNAME#busybox-}.pid"
+
 depend() {
 	need clock hostname
 }
-
-start() {
-	ebegin "Starting busybox-klogd"
-	start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
-	eend $? "Failed to start klogd"
-}
-
-stop() {
-	ebegin "Stopping busybox-klogd"
-	start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
-	eend $? "Failed to stop klogd"
-}

diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd
index f51946f..5e8038a 100644
--- a/sys-apps/busybox/files/ntpd.initd
+++ b/sys-apps/busybox/files/ntpd.initd
@@ -3,19 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/busybox-ntpd/files/busybox-ntpd.initd,v 1.1 2012/08/21 12:39:10 sbriesen Exp $
 
+command="/bin/busybox"
+command_args="${NTPD_OPTS}"
+start_stop_daemon_args="--name ntpd"
+pidfile="/var/run/${SVCNAME#busybox-}.pid"
+
 depend() {
 	use net dns logger
 	after ntp-client
 }
-
-start() {
-	ebegin "Starting busybox-ntpd"
-	start-stop-daemon --start --quiet --name ntpd --exec /bin/busybox -- ${NTPD_OPTS}
-	eend $? "Failed to start ntpd"
-}
-
-stop() {
-	ebegin "Stopping busybox-ntpd"
-	start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox
-	eend $? "Failed to stop ntpd"
-}

diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
index d9ba2c2..8ffe1a2 100644
--- a/sys-apps/busybox/files/syslogd.initd
+++ b/sys-apps/busybox/files/syslogd.initd
@@ -3,19 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
 
+command="/bin/busybox"
+command_args="${SYSLOGD_OPTS}"
+start_stop_daemon_args="--name syslogd"
+pidfile="/var/run/${SVCNAME#busybox-}.pid"
+
 depend() {
 	need clock hostname
 	provide logger
 }
-
-start() {
-	ebegin "Starting busybox-syslogd"
-	start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
-	eend $? "Failed to start syslogd"
-}
-
-stop() {
-	ebegin "Stopping busybox-syslogd"
-	start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
-	eend $? "Failed to stop syslogd"
-}

diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd
index 8d50e53..a72c3ca 100644
--- a/sys-apps/busybox/files/watchdog.initd
+++ b/sys-apps/busybox/files/watchdog.initd
@@ -3,19 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox-watchdog/files/busybox-watchdog.initd,v 1.2 2012/08/29 13:27:03 sbriesen Exp $
 
+command="/bin/busybox"
+command_args="${WATCHDOG_OPTS}"
+start_stop_daemon_args="--name watchdog"
+pidfile="/var/run/${SVCNAME#busybox-}.pid"
+
 depend() {
 	provide watchdog
 }
-
-start() {
-	export SSD_NICELEVEL
-	ebegin "Starting busybox-watchdog"
-	start-stop-daemon --start --quiet --name watchdog --exec /bin/busybox -- ${WATCHDOG_OPTS}
-	eend ${?} "Failed to start watchdog"
-}
-
-stop() {
-	ebegin "Stopping busybox-watchdog"
-	start-stop-daemon --stop --retry 15 --quiet --name watchdog --exec /bin/busybox
-	eend ${?} "Failed to stop watchdog"
-}