main/busybox-initscripts: use pidfile

Use the pidfile rather than exec name to stop services. This fixes
issue with qemu-arm

9 files changed, 65 insertions, 126 deletions

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index cb8b3314af..8335be5463 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox-initscripts
 pkgver=2.2
-pkgrel=12
+pkgrel=13
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
@@ -51,17 +51,17 @@ EOF
         
 }
 
-md5sums="eba3eab9ace889088e01c6c9e80ae3db  acpid.initd
-6db6c6d6a5e0169e54a0e0527d83dfff  cron.initd
-dad20779adfb4b85b57b45c7c903a636  dnsd.initd
-56d24c7bd4e5d442c7436b0819017ff3  httpd.initd
-7504e0700dfa85f354d31af7a58663f9  inetd.initd
-b0146b19b828051985377de1e4431a32  klogd.initd
+md5sums="8928e7df8723012df7350d40a2729b58  acpid.initd
+4ff6e85fb231c9067f10d9dd446852da  cron.initd
+dc825f26e9153f8f7d77162c66f7d876  dnsd.initd
+a3397fe8946b7fff6a0a953d8968d5ae  httpd.initd
+2bb9d1064d8b0dcceb4dac95bf8746ba  inetd.initd
+8b7ced45d0880e3f1b6a1047520de035  klogd.initd
 6de9bac27127a7e1dbcc86acbc920521  mdev-mount.initd
 8ead1e5bb37f536ca736a1e0d0cd7522  mdev.initd
 c01dc869cbdd68e86e64a35ccc1e885e  rdate.initd
-4ef91ad26f5b6e64b5bc545e35f18af1  syslog.initd
-254186e513ff9fb9ede6a2e92257b247  watchdog.initd
+b4b0db90a0e341a39baf55eacbda79c2  syslog.initd
+aed11322e338cb98a22b11fe71200c58  watchdog.initd
 8ddb8d040c9c7a32c63039a2c80ff496  cron.confd
 60bc14cc3163d76f41bcc93dc0f9984b  klogd.confd
 22adbf155ffc4595206ded6daad07812  rdate.confd
@@ -74,17 +74,17 @@ daf57f3d0372f825ddc05b00973e5afe  usbdev
 30b0c85956b6701caf55309a17e537f6  usbdisk_link
 826d85313ca7a4a0205d63bd58b7d01f  xvd_links
 c6470658e54f040bb85cb1fc7b56f10c  default.script"
-sha256sums="716a402240f57ff777c2fc9d5e88f1c22abce9034f041be0e100ab8c1ee7f2af  acpid.initd
-6d36b8478f3775a3f670c00a5f63647108e60a4867c5e447d45c5f5e277b5be9  cron.initd
-4d2522011884af8a00e4132ee5b483db47ca949f37b8d85679f3f9919ac51eec  dnsd.initd
-92c1b2778702724fea6dd0a982acef933f8991381c60909bda9b416f8433580c  httpd.initd
-eb67a75f410d093efab7fd535a0f312f76395edd86e6549d6f07248db91daa59  inetd.initd
-dd99ebb1285065101bf96f0184d546961d76feaf4e968c530941a351b217d86a  klogd.initd
+sha256sums="894bf4edd028433bcfa5863b225387a94db477e9b4319f1655dd74907366d245  acpid.initd
+9e631207340e1879318ad377b9d74ad77978c5db8bcea1bb0a4871525d67a8e7  cron.initd
+5e8f251a3698700bc3cc064dd3dc85f791c6a66d32d088e107de7ac71be70697  dnsd.initd
+0f367092a4faebbfb06ba137ff9805678a5aa37743cebedd13846a9e39222d33  httpd.initd
+efd49fa6aed1f4a7fcbdbc66bc9bfa07be88df500c95d6ee2758d9f45e2bfd3c  inetd.initd
+248b8a2e6fed69454146a89bb1fa8a1927a09c1f6d28965f4b9dcc4ac20513b3  klogd.initd
 2e926542fd4e0fb16e2655ddef0d0cd752178757eff4f19ad09714509e534951  mdev-mount.initd
 9d3fefb7f1e76eefd61151013da014694a6f2f74b9594b7276633db636bdcc7f  mdev.initd
 fe551ee6bf08b6e0e9eaea3c93edead6e0ed3aa7c9c1129ba3c503bebdbc7c25  rdate.initd
-21f260489132820111873db0a2ec9febae0d481a06ef6be1943449f0082fc9d0  syslog.initd
-e3bb9f5135d8700d2aa8bb2ad9bb057ce5330793fc51f06c81d3267561b0f2ac  watchdog.initd
+307dd78e4fc738e0a45e9d57cf895ae1e0d00f4a7a7a6f75cd0c6927ff7d348c  syslog.initd
+8bbfdccb64fe94e3537b71ec2aab43b7050e8a099c4c779e00c5ee1e13dc3061  watchdog.initd
 6b466c5b0e9cab7613aa56edf383e891c5c7e26ee00467e9f7913808be23a328  cron.confd
 f6cd63d6e5f384dcb01a4906c9a0b6c5923794380235dfe0d79b48a686b03c5d  klogd.confd
 791d49802395861a5f788dc7436c1260ec2cd3bdea0c790952ae1b2dd518e811  rdate.confd
@@ -97,17 +97,17 @@ dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb  usbdev
 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858  usbdisk_link
 86ed99205050a5dcca8a27c7e8658df8c55dc85ed810db0d64b51f7c63aa140e  xvd_links
 b9129dd73ffa93f9a5fa85469b9ba144cc4948b02de0bea45eee0469176cc8f8  default.script"
-sha512sums="2897d71b825a7788aaaa6ad66a54bf33db6a9eadd216289ac2a45381ae37cd5f0542cf88a1c0c846b2fa6a228e18d9c51eeec01e0174b666424083a86d84fa9e  acpid.initd
-4c687c65b72488e8860f050677da17b3610d7f6a81d1f73a33cef9d48b4b5f20ea0d7d7b2e1f030747a99331cdf731d42efe211d0ac2fdcd0833f9d7a9328321  cron.initd
-8a4dc914780c179d926c64da262af4ae4133739bfd1734e0fe63067eaac7b1942c4fe5ca9c9e0f74481db8fcd12f75ab9e70cd1cfb6ebb36eeb6998bbbf6c602  dnsd.initd
-d9a03af5dec8371492401024c7fa599268603fa6c9dd9e48ae7899c9f45f1afa537a48d667cfe6c0257c4e1dca7ad66be6093b0768dd5a843fd46c7891ec2265  httpd.initd
-0f7984e3474e7c7d8de0d503b436a3c7679ec6e8f86c0a810ba9902703d9d68d2e210bf96da8d0ad603d12fb075d102b3f468b9050e6f03d7e0f5c577ed0f26e  inetd.initd
-389838a84193152abf67ac110071dacd9ed59c6ecec8884196fa9d15e2887a69200eadcad003809043dfcdc2f045f534b092725b1b3adf0f215a7941d927003a  klogd.initd
+sha512sums="bbd5cb45af37114a1d106e1dad6839e98c62714f94e44e480e46f7c806c6d6c434e7852980139222493fb74760f2815bbdc4bc97a683d1f3345315991056c8fa  acpid.initd
+44cacb40d7e732443a3bbc550b907858b404ddba928c7c30d22dfe672c36dd060b9ffa57b11584ece6a7fd5f01c056dd8b61862a2d4e0e7a47e4181784ee4af5  cron.initd
+900ca3d192b3edade80b9b8b660bfe2897522ef6f36c342ea16d6f21e6d2acc609d66fc7c77133b03239f19bee2a6227851bc75279ebcab561d6784e947b6328  dnsd.initd
+6d9e980f3d04e0c860fdbd61e8943a07e66b14220a015bed20de59b9be40849490457f17b7e28030263c6c8609a3a440c526b1083a87d3c739ded3b11f3f81cc  httpd.initd
+e5856b6d83047a84f9332a0634de5f165e65878138298a1c737b9326be5a206d24f43227a88b5644f07bdfc7b0974b4d92881bb6236079e9c6ea267e031f8164  inetd.initd
+0466c53d6cfc62603e1b0c9c5b6551076d3a33ac138a2064339db9ebec2adafb62c4d7ccfb414e6d97260d4abd42efe7d6bda7dafe9ce55e944b10b7cde3d2ef  klogd.initd
 2d43f3d9fb48164b34daaa55e8f2936d6235dd14b1bb368b4bdc90bd870c595fce39accd981ecb23bacdaddf9fa2adbea4eb9ee7080e9dd2fff8e7636f5f9f16  mdev-mount.initd
 2d19e8bb43c5378421934dd436ec36896883b6c35364358b3ee34f6f1fb07f3f49290e0cd32b3d3dc5b863a92a5c4dfe0942e6b62889171edde864fd0b84163c  mdev.initd
 6297d604926b4f13155b8382d6713a820c48d97ce001f6571c1a66b3b96f0f5f6ec6eb684d99016d961b8f72ddd8300e30eebccb84b8064f7582aba88493a017  rdate.initd
-65b73243a325fbcebd8b1d0691b8834b985a5cb863739433e6ae726c03e4ffc9320d8e21a24901bf31507ff448bf320c9df1f839c0a2244208b10b1243c2b535  syslog.initd
-6cca74e18a7465fed6e00fd2bcd6116cb6a02d8b1c3148323b6d07dcc2ff69af1306fe76afc93bd3b5694ba6631a7a40afa95bdcbdca43edac003859c9b56794  watchdog.initd
+5bd3634fe5d7a592369b164f126a56891477e22df6685ff204d1e56973fd182b209f74671378cbf6b78af9764e2788bd5bec9e7e58fbbe1314bb004c4fb445e7  syslog.initd
+f4ddd0acdfff4aa1972e19e7181b363cb3d73e075acd6cc98d153d7748ab2d213a99c9be30f65c696f13bc72782cbb89ad584e3c837f10904bce295dfa79df35  watchdog.initd
 49c4299eca93517f09c6af71dd6bf737fec4006dfbf72b696fc3ec3e39d61fdd63107cae1bd883b2539848d52e6f6b1ed494d0c871e92e50fc55669295f3585e  cron.confd
 f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7  klogd.confd
 3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7  rdate.confd
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-initscripts/acpid.initd
index 5fbae1e5a3..fbb2851224 100644
--- a/main/busybox-initscripts/acpid.initd
+++ b/main/busybox-initscripts/acpid.initd
@@ -1,20 +1,12 @@
 #!/sbin/runscript
 
+name="busybox acpid"
+command="/sbin/acpid"
+command_args="$ACPID_OPTS"
+pidfile="/var/run/acpid.pid"
+
 depend() {
         need dev localmount
         after hwdrivers modules
 }
 
-start() {
-        ebegin "Starting busybox acpid"
-        start-stop-daemon --start --exec /sbin/acpid \
-                -- $ACPID_OPTS
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox acpid"
-        start-stop-daemon --stop --exec /sbin/acpid
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/cron.initd b/main/busybox-initscripts/cron.initd
index 8175bdf2d0..1dc310147a 100644
--- a/main/busybox-initscripts/cron.initd
+++ b/main/busybox-initscripts/cron.initd
@@ -1,19 +1,11 @@
 #!/sbin/runscript
 
+name="busybox cron"
+command="/usr/sbin/crond"
+pidfile="/var/run/crond.pid"
+command_args="$CRON_OPTS"
+
 depend() {
         need localmount
         need logger
 }
-
-start() {
-        ebegin "Starting busybox cron"
-        start-stop-daemon --start --exec /usr/sbin/crond -- $CRON_OPTS
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox cron"
-        start-stop-daemon --stop --exec /usr/sbin/crond
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/dnsd.initd b/main/busybox-initscripts/dnsd.initd
index e11a73d1d6..3afce3a37c 100644
--- a/main/busybox-initscripts/dnsd.initd
+++ b/main/busybox-initscripts/dnsd.initd
@@ -1,18 +1,12 @@
 #!/sbin/runscript
 
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+command_args="$DNSD_OPTS"
+pidfile="/var/run/$SVCNAME.pid"
+
 depend() {
         need net
         after firewall
 }
 
-start() {
-        ebegin "Starting dnsd"
-        start-stop-daemon --start --exec /usr/sbin/dnsd -- -d $DNSD_OPTS
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping dnsd"
-        start-stop-daemon --stop --exec /usr/sbin/dnsd
-        eend $?
-}
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd
index be23a6b3a7..091207e47b 100644
--- a/main/busybox-initscripts/httpd.initd
+++ b/main/busybox-initscripts/httpd.initd
@@ -1,21 +1,13 @@
 #!/sbin/runscript
 
-DAEMON=/usr/sbin/httpd
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+command_args="$HTTPD_OPTS"
+pidfile="/var/run/$SVCNAME.pid"
+
 
 depend() {
         need net localmount
         after firewall
 }
 
-start() {
-        ebegin "Starting busybox httpd"
-        start-stop-daemon --start --exec $DAEMON -- $HTTPD_OPTS
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox httpd"
-        start-stop-daemon --stop --exec $DAEMON
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd
index fa1f015b83..a63fc78ef1 100644
--- a/main/busybox-initscripts/inetd.initd
+++ b/main/busybox-initscripts/inetd.initd
@@ -1,19 +1,12 @@
 #!/sbin/runscript
 
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+command_args="$INETD_OPTS"
+pidfile="/var/run/$SVCNAME.pid"
+
 depend() {
         need net localmount
         after firewall
 }
 
-start() {
-        ebegin "Starting busybox inetd"
-        start-stop-daemon --start --exec /usr/sbin/inetd -- $INETD_OPTS
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox inetd"
-        start-stop-daemon --stop --exec /usr/sbin/inetd
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd
index d783bccdc7..538017043e 100644
--- a/main/busybox-initscripts/klogd.initd
+++ b/main/busybox-initscripts/klogd.initd
@@ -1,21 +1,13 @@
 #!/sbin/runscript
 
+name="busybox klogd"
+command="/sbin/klogd"
+command_args="${KLOGD_OPTS}"
+pidfile="/var/run/klogd.pid"
+
 depend() {
         need clock hostname localmount
         before net
         provide logger
         keyword novserver
 }
-
-start() {
-        ebegin "Starting busybox kernel logging"
-        start-stop-daemon --start --exec /sbin/klogd -- ${KLOGD_OPTS}
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox kernel logging"
-        start-stop-daemon --stop --exec /sbin/klogd
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/syslog.initd b/main/busybox-initscripts/syslog.initd
index 86050f1afe..c8a68bcd07 100644
--- a/main/busybox-initscripts/syslog.initd
+++ b/main/busybox-initscripts/syslog.initd
@@ -1,19 +1,11 @@
 #!/sbin/runscript
 
+name="busybox syslog"
+command="/sbin/syslogd"
+command_args="${SYSLOGD_OPTS}"
+pidfile="/var/run/syslogd.pid"
+
 depend() {
         need clock hostname klogd localmount
         provide logger
 }
-
-start() {
-        ebegin "Starting busybox system logging"
-        start-stop-daemon --start --exec /sbin/syslogd -- ${SYSLOGD_OPTS}
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox system logging"
-        start-stop-daemon --stop --exec /sbin/syslogd
-        eend $?
-}
-
diff --git a/main/busybox-initscripts/watchdog.initd b/main/busybox-initscripts/watchdog.initd
index 7363bb7553..986a113b83 100644
--- a/main/busybox-initscripts/watchdog.initd
+++ b/main/busybox-initscripts/watchdog.initd
@@ -1,25 +1,17 @@
 #!/sbin/runscript
 
+name="busybox watchdog"
+command="/sbin/watchdog"
+command_args="${WATCHDOG_OPTS} ${WATCHDOG_DEV}"
+pidfile="/var/run/watchdog.pid"
 depend() {
         need dev
         after hwdrivers
 }
 
-start() {
+start_pre() {
         if ! [ -n "$WATCHDOG_DEV" ]; then
                 eerror "WATCHDOG_DEV is not set"
                 return 1
         fi
-
-        ebegin "Starting busybox watchdog"
-        start-stop-daemon --start --exec /sbin/watchdog \
-                -- $WATCHDOG_OPTS $WATCHDOG_DEV
-        eend $?
-}
-
-stop () {
-        ebegin "Stopping busybox watchdog"
-        start-stop-daemon --stop --exec /sbin/watchdog
-        eend $?
 }
-