Use start-stop-daemon correctly.

Package-Manager: portage-2.1.2-r10

3 files changed, 23 insertions, 27 deletions

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index 39c2ee586437..4c6f67ec6b84 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.58 2007/02/13 00:33:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.59 2007/02/23 11:17:38 uberlord Exp $
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/metalog.initd:
+  Use start-stop-daemon correctly.
 
 *metalog-0.8_rc4 (13 Feb 2007)
 
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 5d088b174078..efe7adbf5d68 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX consolelog.sh 274 RMD160 4b56fec016ef9fdd56ad6740e8585e0a79208759 SHA1 7f5ec30286caa9c874e8d4206c96b70b29660449 SHA256 feac696a2d567cd159922ea2ea88194f24ef7574e49a73520528f6116bd3dfa9
 MD5 5e145b00f973f1b9ed8cfa12dcd9a928 files/consolelog.sh 274
 RMD160 4b56fec016ef9fdd56ad6740e8585e0a79208759 files/consolelog.sh 274
@@ -17,10 +14,10 @@ AUX metalog.confd 505 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 SHA1 84031
 MD5 ec30e8aa71d3b8fa92e0d6d1ca908797 files/metalog.confd 505
 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 files/metalog.confd 505
 SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99 files/metalog.confd 505
-AUX metalog.initd 777 RMD160 85ae3506cb31f9878369fb9b96dcdf9489684681 SHA1 b294659677cfe5e43b6cfd9f4ebde1f0eb0b818f SHA256 e2242c702a34508e6efa4ac6834c76fab1873113e6eb16ee9ad1350234359e6f
-MD5 14b3ecdfc4a766ac5c72fc203a1393a4 files/metalog.initd 777
-RMD160 85ae3506cb31f9878369fb9b96dcdf9489684681 files/metalog.initd 777
-SHA256 e2242c702a34508e6efa4ac6834c76fab1873113e6eb16ee9ad1350234359e6f files/metalog.initd 777
+AUX metalog.initd 1029 RMD160 4c609ae69daa3acb32f6081653ba23f97f3e63d9 SHA1 a8d7d4a0ee33b0b02b7120c5c86bdef084ff419d SHA256 9801ae4046321740980798c40dd5b19bc015ab7f1f68b1066b5f0ecd3338a0df
+MD5 deb49ff3e6119491ebd80ff737001d89 files/metalog.initd 1029
+RMD160 4c609ae69daa3acb32f6081653ba23f97f3e63d9 files/metalog.initd 1029
+SHA256 9801ae4046321740980798c40dd5b19bc015ab7f1f68b1066b5f0ecd3338a0df files/metalog.initd 1029
 DIST metalog-0.8-rc1.tar.gz 121744 RMD160 29747402e79fdbe73a1880c792d62af534d407a4 SHA1 0c704ec61ebb799a1826116207d2ac5945d50192 SHA256 45a77348b834482ecfd5e0455c4444009cf26bc319e2a4c409e9ea1df890ab51
 DIST metalog-0.8-rc2.tar.gz 129209 RMD160 9da1f5c2b066d6858fca922c18d884e1ec60608d SHA1 e165598b90d67a6089d0d29e9f4abf32575e1c93 SHA256 37969e465c2ab9706e8bf27d396d4b864464cc62e62aa1ac38a9b20a37cc14f6
 DIST metalog-0.8-rc4.tar.bz2 104664 RMD160 fd48804cfccaec07ad197463d78eb95912c27e18 SHA1 aa010080e94c8347716066ff97771778bb2146cb SHA256 df373d1c02506e983d049b825399388757fad95b9b7090d9f8696a4837e87647
@@ -36,10 +33,10 @@ EBUILD metalog-0.8_rc4.ebuild 1415 RMD160 625e22a5e25e66bc040eb22608ed2bbf43f36d
 MD5 ecc29dd6cb2046c60cc6cd67584d191f metalog-0.8_rc4.ebuild 1415
 RMD160 625e22a5e25e66bc040eb22608ed2bbf43f36d1b metalog-0.8_rc4.ebuild 1415
 SHA256 0b4ba3647cdb1190dd1cfb2e3660b98a2e3213119f360565ad1ff8d1cfc53983 metalog-0.8_rc4.ebuild 1415
-MISC ChangeLog 7603 RMD160 3732cafd4d0fc9645ecd489513f2b69abf7424b5 SHA1 c52b3835051d52daef9b41ef6e64612aaefcdd14 SHA256 5f8a1f88ab06b7465b2e54821205469db3fe019b75c3752d5ab2aeaded85a337
-MD5 8233009fb1b568b46710de3e43682856 ChangeLog 7603
-RMD160 3732cafd4d0fc9645ecd489513f2b69abf7424b5 ChangeLog 7603
-SHA256 5f8a1f88ab06b7465b2e54821205469db3fe019b75c3752d5ab2aeaded85a337 ChangeLog 7603
+MISC ChangeLog 7711 RMD160 129fc297a7d30654458ab36e1d13043de48ce26e SHA1 be4764d13489cb0ca55a092ecf01fe4bb46c653e SHA256 7298378aaa269c9b449f22ad471abc94d5d957239d03ba4b377c4a5af2bb264c
+MD5 d64036be9787cb0fe77c1999026047e6 ChangeLog 7711
+RMD160 129fc297a7d30654458ab36e1d13043de48ce26e ChangeLog 7711
+SHA256 7298378aaa269c9b449f22ad471abc94d5d957239d03ba4b377c4a5af2bb264c ChangeLog 7711
 MISC metadata.xml 314 RMD160 b5cfae82ba7a016a10d13d0b62b0d66e50fb6b01 SHA1 7f6322c1fc2a5a6e4a35cf14b2703ff5dd2e7cfe SHA256 78aebc8429da49e61f8be390a479e595376714b34c9f707bcd8a032e17f0f28f
 MD5 6c2b69b044ec7524da59b7415ff50e86 metadata.xml 314
 RMD160 b5cfae82ba7a016a10d13d0b62b0d66e50fb6b01 metadata.xml 314
@@ -53,10 +50,3 @@ SHA256 a29e83b4181d7f0d0439637098e4e26582595fd79b9575c57ec19872a06d2e21 files/di
 MD5 0a586777ea44236021d9615ba2bb4a3e files/digest-metalog-0.8_rc4 250
 RMD160 bf4e61ee03f5bc3c7c89c6e4146e90e82688431e files/digest-metalog-0.8_rc4 250
 SHA256 710762fe7ddbe628e2190a79b1ccfbd2b335a23ae1f6a28a81b8ab9b6110b742 files/digest-metalog-0.8_rc4 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF0QeA8bi6rjpTunYRAvuVAJ4nW4v/elVuRhDP/hiBtY34m2yh2QCfWIxx
-nk1c0DOIs64oQ3Otf779CNU=
-=zU3L
------END PGP SIGNATURE-----
diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd
index 57d744053511..ed8949379c61 100755
--- a/app-admin/metalog/files/metalog.initd
+++ b/app-admin/metalog/files/metalog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.2 2007/01/27 12:11:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.3 2007/02/23 11:17:38 uberlord Exp $
 
 opts="buffer unbuffer"
 
@@ -16,27 +16,30 @@ depend() {
 
 start() {
 	ebegin "Starting metalog"
-	/usr/sbin/metalog \
-		--daemonize \
-		--pidfile=${PIDFILE} \
-		${METALOG_OPTS}
+	start-stop-daemon --start --exec /usr/sbin/metalog \
+	    --pidfile "${PIDFILE}" \
+	    -- --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping metalog"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	start-stop-daemon --stop --exec /usr/sbin/metalog \
+	    --pidfile "${PIDFILE}"
 	eend $?
 }
 
 buffer() {
 	ebegin "Enabling log buffering"
-	kill -USR2 $(<${PIDFILE})
+	start-stop-daemon --stop --oknodo --signal USR2 \
+	    --exec /usr/sbin/metalog --pidfile "${PIDFILE}"
+	eend $?
 	eend $?
 }
 
 unbuffer() {
 	ebegin "Disabling log buffering"
-	kill -USR1 $(<${PIDFILE})
+	start-stop-daemon --stop --oknodo --signal USR1 \
+	    --exec /usr/sbin/metalog --pidfile "${PIDFILE}"
 	eend $?
 }