sys-apps/busybox: use --name in start-stop-daemon

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 37 insertions, 37 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2210bc1..a835396 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -3,11 +3,11 @@ Hash: SHA256
 
 AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
 AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX busybox-ntpd.initd 602 SHA256 95383156f6f417719bd4d5655e9291e2e7a3e9fa815329eb60c2b911e79f859b SHA512 6aff8dc4e7740f58f1d43aafd1aca22fecb9f138ec155e4a1bae43a214007e06d92bc648bf965f08fc151b00cc97c32f24bf0691847a79e684f3972ee7356d82 WHIRLPOOL 0b09ae03d45d9af92bda0f0f716c3c112c1be353e229fbe8d84614d87b844bc130d5d5cdb819d496382d943e584cca347465cc4139a9ed2d57212de85805d0bc
+AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3
 AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
-AUX busybox-sysklogd.initd 1256 SHA256 9302f0b7b4ee35c25195dc8c57bd3c2c55d85b3661aef7e551e39b3a5e26d604 SHA512 cdf95d8e39331f8887fc8955352587b39026f7aee00371499fca8e110f36f793ff58809de300da38b8fe58fbc0c953fbad70277eb13289087170fe93de86e4b5 WHIRLPOOL 05c5c4a9cf5e0524def3ef0210af9f39d669459c792f5fced46c92bec82337e621958d060ac86d3eb3d435a429401bcbd7310bd3e04e5bb0e431ff9f4cb46e8d
+AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a
 AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX busybox-watchdog.initd 640 SHA256 0cbfbf8fb77e678e609fc7bf7dc62700d3cf44acf40f3c53e2e522bc91de5c99 SHA512 85f9a13bedc6e55c7082c391c26dd85af9ca986810c0773adcb477b2c15240a1b1abf834fad8782d1595f651002d749ce80a139b00e524b75dcbcd209ed7df0e WHIRLPOOL ad085b343a299004e0f69b8c45e0003e5090b93d256ea16f74dbb39ef20cc71846ff61609455c2d638f7921419f68e8236ceb98f856149208d07ece2e1553ac0
+AUX busybox-watchdog.initd 663 SHA256 0dfd0cad7909713b563fd36a5751fe9a81f9e2888e2bf2d78e6f3b1daf9adccd SHA512 9ab24fbe4976cc3f05a609f7888f095b9003bc99296646848aa26eacd2a0f8e484470e2ea4706c5f3bef7e73feda34d420ae1307ec68184606d42229269afa2a WHIRLPOOL c93e1d8fb38d5b5a4399f28e5c7f0dc6079fb98569a1edda23fabd8899d78ee9340eef70b2c2a54c8ff01255e401c26bd0bcaa50ad6873aaec62e7433b13ead9
 AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
 AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
 AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
@@ -16,22 +16,22 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
 AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
 AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
 AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9380 SHA256 5eb471a98e5a2bc00d135004f7a2f92d9f8ce45f138d2461c8a622b30b608f5a SHA512 5559b25e7353e3a9d9bf4a0fc439cdff629182f763ef24342cdb076a4c2f2013c6ea2aac17475a84bb870287ad0007475cd0a1d35b39818cdeefa4021ba556d0 WHIRLPOOL 1c46244d253d7f0f47dda8ed59b477b6e8596178d6d7ebfc2737b67260f06ded67ba520e1d7ee3ab5d42c9c9a5aa485d211b763a5a437d2fd6684023d6f61533
+EBUILD busybox-9999.ebuild 9382 SHA256 9b36e9bad2bb6912a7fdc42533be54d313f32255749e0a964781640ad37f5844 SHA512 ac0c0c9a32571efc27bd0919a21118de937eab97871f512de2c62a3c70adc4849774be0834e5c592de4eb8adee3f70c063503f3a376aabc7444e65ea022b68ae WHIRLPOOL 714d4cc08720e28586f18580e1df5e714d6a13063eb6e537d090d1f328f5a2e4d9cd12c385f87156f3298ad9f3e7022bfac4949e0e42588f864df97edff97ee1
 MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQuW4+AAoJEJOE+m71LUu69eMP/jroN2ES50KDCEFhpJY5RRkM
-ezhOEwFzDfpRDZD+LYGEwdqeH76d/It7qVArE7utj9lQROJC07eIz0Nz/ogbA1th
-Hlt1YMwiBzC/rTq2JFgpVeOTzzceFGf6xXYGiCx1kw0wRhuvsqLdTJuRL9JAf/Kr
-igR+aIjudp8MI8qqxptMxP5GoL9ADwg5gzZ6il28Xc3hMynLJHDtBzdVzrphczFq
-Icug7TpAqErLZYSLTFvcGM2Im5XN67LPb8FE0W2uoOljwBnfrjO7UZeyNtxjYXnv
-rFbE/Wk7m9auYYEH5mvjYR/7UDPFV8cIglS5pD1/vckcaPAd1nFlDFguQn1QyXnz
-YQv8J3bJ6osj4x2pSwBTnSVS6khSiAjjrVkLE4Ip8Jr3solwKpADJ9I85oMlR1XQ
-LwlZETwmaiRD11mcWGObl/m9AH64P284CYIbpifcfTsHo5VHz7YrUs/QZfKSkpjY
-dk38YpGiorg116TOGpBF4wgr6gaBJ1iEWbb/Trnnxfk+IHUqWNhW9s/H6CkXBd7r
-H3hzE8Y7GrCEoGZuYP8MOM9vIIkn91R5c1R2BapCst77uIreEyo1C/0Q0tA7P2+D
-jGHQIGbV7lhM1BzdPnqw1KZ/tJgaKLD+ORpUDiUpc318DWT0ksOsgqPByrECo8ds
-y33WNPWLWfsrz9tihKOs
-=BghK
+iQIcBAEBCAAGBQJQuXa6AAoJEJOE+m71LUu6VE0QAI5UjWrFg0uIMr8na9Ns3Z5/
+xA0BXUfkAOCMU3T70L+iBckHcWkJes0kg/79eIKJZjwuEOiMJvMNKEhesC2odsyk
+dOIwLX7lUY82sqoq6rSwhx2Oo685X8wKI4orC2KGvQk+1A7T4FqCSjaSpOyhSlqm
+8rOW4TXrQlwh0rYPz4nKkoEmqmLoJVA90GHN7hxKrgfwDiv2+1zZtg88+jsw//39
+dySSVtCTOJDJ7GXzfM7OCuT+arOFbLcJdqRtYEgyAnA4shtF+uhmxaqeoEtvC+D/
+N181Q+waWakaHzUtBqdC1QEqyJoZpibWRLuy0IJ5JAFOya1Aoi9gSv/IwJeQAM92
+pW15QT9uMmhcaGy4wG2LXpT5+5uswyE3e93RqHTn+WBktI5NRv7vxruY0LKPAipx
+1aOV0vTE1TVUZY37Iu1GFGvt2pzloZv9EosZOiUQMdy8id5X4Fwq5IoieCl98LBi
+m6gWN5vW440hVN5lsiCDFjlaDRa4TVCpnR22xPh5zM1O4nDJNt4D75095M/CdFmJ
+iQntsuPeoihgbIWm9BUtelFQKFOXo/TCepaceNSPmsIPg6fts9LAlXdA7AP8c/az
+emcQcR6MqqtVCIU4GX63Sl4kSeRgOKAIlBBXlWcCsaJ9f2KppFFFSANQYrX1Yc1o
+8RfzEYB8mx3zIF6HBxQ2
+=tW6f
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 922d526..df3989f 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -175,8 +175,8 @@ src_configure() {
 		busybox_config_option y FEATURE_NTPD_SERVER
 	fi
 	if use sysklogd; then
+		busybox_config_option y SYSLOGD
 		busybox_config_option y KLOGD
-		busybox_config_option y FEATURE_KLOGD_KLOGCTL
 	fi
 	use watchdog && busybox_config_option y WATCHDOG
 
@@ -245,16 +245,16 @@ src_install() {
 
 	# add busybox daemon's, bug #444718
 	if use ntpd; then
-		newconfd "${FILESDIR}/ntpd.confd" "ntpd-busybox"
-		newinitd "${FILESDIR}/ntpd.initd" "ntpd-busybox"
+		newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
 	fi
 	if use sysklogd; then
-		newconfd "${FILESDIR}/sysklogd.confd" "sysklogd-busybox"
-		newinitd "${FILESDIR}/sysklogd.initd" "sysklogd-busybox"
+		newconfd "${FILESDIR}/sysklogd.confd" "busybox-sysklogd"
+		newinitd "${FILESDIR}/sysklogd.initd" "busybox-sysklogd"
 	fi
 	if use watchdog; then
-		newconfd "${FILESDIR}/watchdog.confd" "watchdog-busybox"
-		newinitd "${FILESDIR}/watchdog.initd" "watchdog-busybox"
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
 	fi
 
 	# bundle up the symlink files for use later
diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/busybox-ntpd.initd
index 495bc53..e212ffc 100644
--- a/sys-apps/busybox/files/busybox-ntpd.initd
+++ b/sys-apps/busybox/files/busybox-ntpd.initd
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting busybox-ntpd"
-	start-stop-daemon --start --quiet --exec /bin/busybox ntpd -- ${NTPD_OPTS}
+	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 --exec /bin/busybox nptd
+	start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox
 	eend ${?} "Failed to stop ntpd"
 }
diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd
index 85e87d1..4121a1c 100644
--- a/sys-apps/busybox/files/busybox-sysklogd.initd
+++ b/sys-apps/busybox/files/busybox-sysklogd.initd
@@ -9,29 +9,29 @@ depend() {
 }
 
 start() {
-	local retval=0 daemon="busybox syslogd"
+	local retval=0 daemon="busybox-syslogd"
 	ebegin "Starting busybox-sysklogd"
-	start-stop-daemon --start --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
+	start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
 	retval=${?}
 	if [ ${retval} -eq 0 ]; then
-		daemon="busybox klogd"
-		start-stop-daemon --start --quiet --exec /bin/busybox klogd -- ${KLOGD_OPTS}
+		daemon="busybox-klogd"
+		start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
 		retval=${?}
 		if [ ${retval} -ne 0 ]; then
-			start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+			start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
 		fi
 	fi
 	eend ${retval} "Failed to start ${daemon}"
 }
 
 stop() {
-	local retval=0 daemon="busybox klogd"
+	local retval=0 daemon="busybox-klogd"
 	ebegin "Stopping busybox-sysklogd"
-	start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox klogd
+	start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
 	retval=${?}
 	if [ ${retval} -eq 0 ]; then
-		daemon="busybox syslogd"
-		start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+		daemon="busybox-syslogd"
+		start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
 		retval=${?}
 	fi
 	eend ${retval} "Failed to stop ${daemon}"
diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/busybox-watchdog.initd
index a9a681d..febea06 100644
--- a/sys-apps/busybox/files/busybox-watchdog.initd
+++ b/sys-apps/busybox/files/busybox-watchdog.initd
@@ -10,12 +10,12 @@ depend() {
 start() {
 	export SSD_NICELEVEL
 	ebegin "Starting busybox-watchdog"
-	start-stop-daemon --start --quiet --exec /bin/busybox watchdog -- ${WATCHDOG_OPTS}
+	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 --exec /bin/busybox watchdog
+	start-stop-daemon --stop --retry 15 --quiet --name watchdog --exec /bin/busybox watchdog
 	eend ${?} "Failed to stop watchdog"
 }