Make the init script use foregroupd mode and create a pidfile to better identify the correct process to stop.

Package-Manager: portage-2.1.2_rc2

3 files changed, 22 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 986e9b89a12f..977138339fbe 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.32 2006/11/19 17:02:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.33 2006/11/20 12:37:42 flameeyes Exp $
+
+  20 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> files/rarpd.initd:
+  Make the init script use foregroupd mode and create a pidfile to better
+  identify the correct process to stop.
 
   19 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> +files/rarpd.confd,
   +files/rarpd.initd, freebsd-usbin-6.2_rc1.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index d0543d5f868b..5d39daf569f5 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -61,10 +61,10 @@ AUX rarpd.confd 269 RMD160 de16adb7bd4a7e2deea75fb6ba4d717582e376cf SHA1 b15f515
 MD5 da16b87b1e974c523572a1ab545f8432 files/rarpd.confd 269
 RMD160 de16adb7bd4a7e2deea75fb6ba4d717582e376cf files/rarpd.confd 269
 SHA256 aa45f3085267be17d6549e05c5fbe21c4035b41c620023d76e38537fc82594cb files/rarpd.confd 269
-AUX rarpd.initd 766 RMD160 38914a84180d4c1f026426c867748ae265715f79 SHA1 6c7c8b1034bc36fac8460a5c5dc81d4b80033b30 SHA256 3f8ba48ab67c21dc5a874c665a7c240f26b13f31b6309c71f0af0eb1bcea5512
-MD5 e3ce50531ddf9309b8a14900d90c0877 files/rarpd.initd 766
-RMD160 38914a84180d4c1f026426c867748ae265715f79 files/rarpd.initd 766
-SHA256 3f8ba48ab67c21dc5a874c665a7c240f26b13f31b6309c71f0af0eb1bcea5512 files/rarpd.initd 766
+AUX rarpd.initd 867 RMD160 5f146a5f74688ceea6eaf9d4e089cc0c7e22e3b9 SHA1 4f7a59139807ec8e68be6801baba59a63558e4d4 SHA256 d5df8b6f5ff86a5a201a05ee025a749c21aeb25eb8d27259e8f0b3a433cd30f3
+MD5 543cdfe800cd3620b85859be6ff8bafb files/rarpd.initd 867
+RMD160 5f146a5f74688ceea6eaf9d4e089cc0c7e22e3b9 files/rarpd.initd 867
+SHA256 d5df8b6f5ff86a5a201a05ee025a749c21aeb25eb8d27259e8f0b3a433cd30f3 files/rarpd.initd 867
 AUX rpcbind.initd 639 RMD160 3901302ea80d110a83404a883c9ce32b8eb5dce1 SHA1 4d8109881c9a6893a860f191bb2fb51ddbffedb3 SHA256 435dbc12922affda1e915abf7fa2ae524e7637586832002404fe264570f0ff57
 MD5 a416276060ff5fb771144bb9cf98fc34 files/rpcbind.initd 639
 RMD160 3901302ea80d110a83404a883c9ce32b8eb5dce1 files/rpcbind.initd 639
@@ -120,10 +120,10 @@ EBUILD freebsd-usbin-6.2_rc1.ebuild 5317 RMD160 cc4c1662957305bf76175eb5e7cd9eab
 MD5 10e666a2e5781a8bae0595417e21bc21 freebsd-usbin-6.2_rc1.ebuild 5317
 RMD160 cc4c1662957305bf76175eb5e7cd9eab4b78eb26 freebsd-usbin-6.2_rc1.ebuild 5317
 SHA256 55110d76602d8fb7f8a6d8709afa43a5a3d41cee7a5f112d330e33765f956479 freebsd-usbin-6.2_rc1.ebuild 5317
-MISC ChangeLog 12115 RMD160 b5cc3460da3f422906fff8769a17252ecdc43350 SHA1 ef4b622534416fc10450860bba386f1a4e11f5f9 SHA256 340ee5b74e0e015c8b1eb11a438f1dce6190dabbf1741efcc9545151a7d6cb09
-MD5 7c4aac6871bf49a7e21e33f469067890 ChangeLog 12115
-RMD160 b5cc3460da3f422906fff8769a17252ecdc43350 ChangeLog 12115
-SHA256 340ee5b74e0e015c8b1eb11a438f1dce6190dabbf1741efcc9545151a7d6cb09 ChangeLog 12115
+MISC ChangeLog 12302 RMD160 c16fea6a0338619da19e5eeb0166a3b28d8b44ae SHA1 c64443f20a3f114ac62105b265ceb10b218e0c1d SHA256 bfe70b2bd01f2eaa8f0eb359ad937d724f87f4d554504f92af34a43224bd63f8
+MD5 8a242a8855bb5ad4431515e1b9eb6285 ChangeLog 12302
+RMD160 c16fea6a0338619da19e5eeb0166a3b28d8b44ae ChangeLog 12302
+SHA256 bfe70b2bd01f2eaa8f0eb359ad937d724f87f4d554504f92af34a43224bd63f8 ChangeLog 12302
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -140,7 +140,7 @@ SHA256 2bdda0b85b870524cda906fe90cc3c2659ef612c55be3acc7aa039fbb38aa797 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYI40AiZjviIA2XgRAivHAKCAeyCh6nZuJFhOKsFNY9iQRDlLUQCgmCpy
-fk2i2AAOMVcErtZMphVsUXY=
-=D/0U
+iD8DBQFFYaGwAiZjviIA2XgRAnQ1AJ96J30r8BHBz2SelafpBZuVWw+MGgCgmX9V
+Ljjet/DCbqPKqc5gY9Jh3Q0=
+=UybZ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd
index 34105eb838d9..ab4ad4f59c91 100644
--- a/sys-freebsd/freebsd-usbin/files/rarpd.initd
+++ b/sys-freebsd/freebsd-usbin/files/rarpd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.initd,v 1.1 2006/11/19 17:02:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.initd,v 1.2 2006/11/20 12:37:43 flameeyes Exp $
 
 depend() {
 	if [[ -z ${RARPD_ONLY_INTERFACE} ]]; then
@@ -21,12 +21,15 @@ start() {
 	fi
 
 	ebegin "Starting reverse ARP daemon"
-	start-stop-daemon --start --exec /usr/sbin/rarpd -- ${rarpd_opts}
+	start-stop-daemon --start --background \
+		--pidfile /var/run/rarpd.pid --make-pidfile \
+		--exec /usr/sbin/rarpd -- -f ${rarpd_opts}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping reverse ARP daemon"
-	start-stop-daemon --stop --exec /usr/sbin/rarpd -- ${rarpd_opts}
+	start-stop-daemon --stop --pidfile /var/run/rarpd.pid \
+		--exec /usr/sbin/rarpd -- ${rarpd_opts}
 	eend $?
 }