Make init.d baselayout2 safe.

Package-Manager: portage-2.1.2.4

3 files changed, 17 insertions, 23 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 7b48e3fc4284..8bdb9925873f 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.41 2007/04/28 17:47:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.42 2007/04/30 06:45:49 robbat2 Exp $
+
+  30 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> files/init-keepalived:
+  Make init.d baselayout2 safe.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> keepalived-1.1.11.ebuild,
   keepalived-1.1.12.ebuild, keepalived-1.1.13.ebuild:
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index f497205ff555..c17736d6971c 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX init-keepalived 746 RMD160 5f6074fc828f5df6a6582bf3545b9aebbe57184c SHA1 91583b0039ddaf9d3595dcb520b36d96de116112 SHA256 80a10ea83aea97b573274abf4f92906cbace9645ebf16fb4aa7e559f66278f94
-MD5 eb44784c8591fa108fa55b5cacd29745 files/init-keepalived 746
-RMD160 5f6074fc828f5df6a6582bf3545b9aebbe57184c files/init-keepalived 746
-SHA256 80a10ea83aea97b573274abf4f92906cbace9645ebf16fb4aa7e559f66278f94 files/init-keepalived 746
+AUX init-keepalived 741 RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 SHA1 90287f22be2a60af28d166481ce21ee497abf06b SHA256 eaae345df0c529fdfe5cf70e2a2626c280ecb483cfe8953b992fda29b5c7e063
+MD5 d4b7e19484b051f95ad67bb050ec671c files/init-keepalived 741
+RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 files/init-keepalived 741
+SHA256 eaae345df0c529fdfe5cf70e2a2626c280ecb483cfe8953b992fda29b5c7e063 files/init-keepalived 741
 AUX keepalived-1.1.13-do-not-need-kernel-sources.patch 4226 RMD160 e42b1c1e713fa0e98947e69d9721d365586ab02f SHA1 01616ee6bbdc0ea1d5fa3b0aed13209e0d883357 SHA256 d63ee9a8e1b6eff05539ed08cf37bc07b3d485c7a6af33f2e494de97a22a8d00
 MD5 a4f0940ae2c660966536b8596111f341 files/keepalived-1.1.13-do-not-need-kernel-sources.patch 4226
 RMD160 e42b1c1e713fa0e98947e69d9721d365586ab02f files/keepalived-1.1.13-do-not-need-kernel-sources.patch 4226
@@ -32,10 +29,10 @@ EBUILD keepalived-1.1.13.ebuild 1464 RMD160 5eedff83131db45f3be3b96e2749cb14e26b
 MD5 1be7ab6d2662c7076a6eff588678acc2 keepalived-1.1.13.ebuild 1464
 RMD160 5eedff83131db45f3be3b96e2749cb14e26bf693 keepalived-1.1.13.ebuild 1464
 SHA256 2894154405ec6b99ea3b85502398d6cc8e81667235c483293b1d3cb593f35517 keepalived-1.1.13.ebuild 1464
-MISC ChangeLog 6603 RMD160 d91bd4dffb3c2da2d68bda59cd6924a32dd1d218 SHA1 e77b52d8a726dbecdd108e09cd0e6a657089e552 SHA256 59e1bdef948ca9edf7d58a781041bafb8f93253f7fa9e19f0cc969337c1b83f2
-MD5 55b1a35fd20bed8e42590d955359319f ChangeLog 6603
-RMD160 d91bd4dffb3c2da2d68bda59cd6924a32dd1d218 ChangeLog 6603
-SHA256 59e1bdef948ca9edf7d58a781041bafb8f93253f7fa9e19f0cc969337c1b83f2 ChangeLog 6603
+MISC ChangeLog 6711 RMD160 3098c7688f6513e5533af2566420999a8ebf3913 SHA1 0df52821ec6f6cee027e6cfe6b3a2e18a1530e0e SHA256 8d2330b6b17eae3d6889f5a1c9b7e698b0b48afbc5fd03d35049ecbc817a82ee
+MD5 4b065848ed3f2da21148b9fc4cd1b7b3 ChangeLog 6711
+RMD160 3098c7688f6513e5533af2566420999a8ebf3913 ChangeLog 6711
+SHA256 8d2330b6b17eae3d6889f5a1c9b7e698b0b48afbc5fd03d35049ecbc817a82ee ChangeLog 6711
 MISC metadata.xml 353 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 SHA1 32027c725e0627c88081228eb9b09e1fa001c42c SHA256 4336bfedf26cb9bfbaf200475b8d1d598f972d12e52a50744eb034ece4cf3042
 MD5 31db27806ba9d5a1d0d3ddea439f2c16 metadata.xml 353
 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 metadata.xml 353
@@ -52,10 +49,3 @@ SHA256 fa5e8c459c8860192c3256a48a447b649a46dae17c5d29682a849ee1fc500cab files/di
 MD5 d08c874395ceec732df8e5d5f639c53e files/digest-keepalived-1.1.13-r1 253
 RMD160 bc7d65dcb12abdae82da753bc78edfe6b996a428 files/digest-keepalived-1.1.13-r1 253
 SHA256 fa5e8c459c8860192c3256a48a447b649a46dae17c5d29682a849ee1fc500cab files/digest-keepalived-1.1.13-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM4jHI1lqEGTUzyQRArT+AKCBGoOUQRcdZbz7Ii4Lrpd6kU9HXQCguKtP
-8rfB5iBYZ/dzNAk1pD7rdjc=
-=nsMr
------END PGP SIGNATURE-----
diff --git a/sys-cluster/keepalived/files/init-keepalived b/sys-cluster/keepalived/files/init-keepalived
index de6c3d2d264f..c7b34c3a260f 100644
--- a/sys-cluster/keepalived/files/init-keepalived
+++ b/sys-cluster/keepalived/files/init-keepalived
@@ -1,13 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.3 2004/07/15 00:55:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.4 2007/04/30 06:45:49 robbat2 Exp $
 
 depend() {
 	use logger
 	need net
 }
 
+PIDFILE=/var/run/keepalived.pid
+
 checkconfig() {
 	if [ ! -e /etc/keepalived/keepalived.conf ] ; then
 		eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived"
@@ -18,13 +20,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting Keepalived"
-	start-stop-daemon --start --quiet --pidfile /var/run/keepalived.pid \
-		--startas /usr/sbin/keepalived
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/sbin/keepalived
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Keepalived"
-	start-stop-daemon --stop --quiet --pidfile /var/run/keepalived.pid
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	eend $?
 }