Fix dhcpd init script if you are running dhcpd in a chroot with >=openrc-0.13.9. This should be backward compatible as well, thanks to poly-c for pointing it out.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 18 insertions, 22 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 34fad33cdf60..2ec4e2b34bd6 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.258 2014/11/08 18:24:47 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.259 2015/02/07 00:58:12 williamh Exp $
+
+  07 Feb 2015; William Hubbs <williamh@gentoo.org> files/dhcpd.init5:
+  Fix dhcpd init script if you are running dhcpd in a chroot with
+  >=openrc-0.13.9. This should be backward compatible as well, thanks to poly-c
+  for pointing it out.
 
 *dhcp-4.3.1 (08 Nov 2014)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c2f5ad035f41..72d6f4f3e8e3 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -19,7 +19,7 @@ AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 SHA256 482dea1517e3d7a22c0469908c41c
 AUX dhcp-4.2.5-iproute2-path.patch 340 SHA256 a6c25d408ca1bac5180151ff2955807017c386c06fc162395dcd71040900f59b SHA512 4a5c4f3b1af93fa137d94fd860689919b83de5885198e48eb89678379a59a7c9d90f8a3f558ddf9d442130abb127a460928a85c0646c4ad0984827ccd9e08852 WHIRLPOOL d54ba0f4c3da34375ab0f1fa98368ad4ec4f6ff79a131638a3d6540a4c2fa62e83cb45f946518b114793ad8e868b6cef9ec9338a4930080623439e7692386d77
 AUX dhcp-4.3.1-dhclient-resolvconf.patch 14574 SHA256 9f1d8d987e62679d246c70dbc5149090ce1c382b7256c003f2852dd6617a335b SHA512 0cad400e5517ad9b66fc9aa09b2455809205eeb686dce6c7cc4efb8ea655d8de436f47b91ccf8fbd2c4286ecbb2b9d761b7e60e72ab7456794f3028739d80efe WHIRLPOOL 3a021da8fd0069e668ea79d13e496f40976202dcdfa95e78ef3182a6aafa787cd1cafaaa99c1a8e3655f8d15e989d771173c8add54f93b4b332426cd5863e63f
 AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
-AUX dhcpd.init5 2883 SHA256 049a231908dc2c5f82446712d71d5e75d430bd043b53eead1529f2d81e1595ab SHA512 d286094e4b58a15e7c44051df6c15e2634a80a93936370d76ebf360c87ef985720801b6e511d1222ba93cb6ddcefd8c94ed378e87ec083967f7299bb1bd13347 WHIRLPOOL dd83f4449d552fe1f07aca863e075c096423bc67513af58c96e625e80d4c504f0834fdf2879854fb04e18ac152a8814707feaf948dc4c8845549238acc1d3378
+AUX dhcpd.init5 2940 SHA256 020d7e8baf00b2c56254f0692e5c40146f7f86b378e2bc64662136a8e9a9df1c SHA512 1e98ed10fb365ac4a53db3458ba767d99d33d5100567cab7d9d050b5f3f6a57652d2d0680145d38ba1656aca94b2ae15b2d63642db3f2ff3a5b98d04e02b5f19 WHIRLPOOL f1bf3fff7089629dad9c2fe3bf8cdb0ff5bfae3c368216976178852b1b98d246486c91be37a0e64594fd10559d108ecdbc6eb3d04ae2a2ec06ad8e483557142f
 AUX dhcpd.tmpfiles 75 SHA256 bb344a11fadedaec33ba3c504cc04adba34b15aeb07a640dab6da255de97728a SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb WHIRLPOOL fd4450a697cfbdca4db49eb433c7f67e7a9051541f4ab6e2633659435a504b051aad6338257ece4e5fc950c46f9fa7d5c5820f750440325fc62cae79dff2cfb0
 AUX dhcpd4.service 264 SHA256 174e1a7dab5b23bbbd73a9fe16d3907923c21d2802c51dc1096c9e24bfa9fda3 SHA512 e340311fb890c5fc2f5836cc8d10ea3e4bb34bb5e96e7231798e7d960f05886478bf28305828fbd851080baadafe7d3fd2c7f30a81dcbc68d6368e8b4bd0de71 WHIRLPOOL 121ed7c50b179a7d09f53c758e5d44cd9e91451ca7b577d9b058d8097473df421715018986c314d633a599541d422cbda276831ba8c192c2a8762608fc5f2a3b
 AUX dhcpd6.service 270 SHA256 82efa0887779b8c0f5c33ab77274ff9617f8cca0f59816e0e9425e368f1a1824 SHA512 2898f0dfa56ecb590c25a1f0e44446a83d1d9118e691c9a7680250a9e47f4dec2b36195dbda8259292d93a31bf0e1230b9f39ad93f2b0a9280e8cc4d77b50bae WHIRLPOOL 3040add013f776f1c91624c916456f68307321bd2e2cf69616ac2343743d65dfb9e940bffff089c0c45912d7498c666fcff77b4250ef3c533e1028270d9a4c55
@@ -36,22 +36,12 @@ EBUILD dhcp-4.2.5_p1-r1.ebuild 7589 SHA256 9550000131ba6a3e6fc2e0ad3b4c0beb701a9
 EBUILD dhcp-4.2.5_p1-r2.ebuild 7980 SHA256 8e5c475970aca58a502b370e0ed289e5d5b3e9c53ea8a4b09c57a2a9a79c6dd5 SHA512 e82494443a763c31edd16f25932d23a3b8963afc9a5185dd94d742356d12d5d20559ac265537128dd02ad7dcbd2197be296a8c24dce88f9f4562669352ec2282 WHIRLPOOL d2df0308ecd5c542fb12cc8ae0399851991c49af03d104d5eec3505aa660196b5fdd2b3240c4da80008d917704033b0964d7e4e8a6182ab66b548ee6791db2fe
 EBUILD dhcp-4.2.5_p1.ebuild 7408 SHA256 40f9449d9a0ac310ffbb9275f4fc62714a63b3dac5c5380250d1509b5ae6c14d SHA512 bf5449ba1c547ce8f62ec5ac0ce425e1c7594394bd243f5d8d495985a0b8754106898940ea1f274686bc4eb4e0d3ed822154f12d532f8a0763ebf30a2e325dc6 WHIRLPOOL a8a5c1ccd66068da876ffdeeb49a9079d3b9362dd9b4984969b399483231eb7a0eb61246c4550d24d320462203a1077cc8d9de5797f81f6f441db7aa1693c045
 EBUILD dhcp-4.3.1.ebuild 7891 SHA256 97d7218efd0d5eef90238ca36be526dd109c5c80dae0b4a40fc545a435d39768 SHA512 717162416bacb9046b67e28663eba39558f01ddcc89c51bd58d3854c2cce7dc7518b60d53d32bf746f54ca56932b638485a3b06bd8383ee284bd89e995144ab1 WHIRLPOOL 210f013967922f836c77c993be116a94be562ed669c82e2cd7d25978b61cfa34609a843a19065fa39074e6ee5d9366829903afe0d4ea77450602efaab8fda65d
-MISC ChangeLog 43654 SHA256 a3f111ef0004ac6407b568dd54f131fef806594525023c301b4dec9327509064 SHA512 84d40286db4532a3ab8b2831b929289928404becf3a4109884f1179f33f5ce2e8ddbaefd2f3c67479aacc7b8724808956d3f6a76c2155da187393540fc676958 WHIRLPOOL d02ca884dc3ea1680a77b7697bffe057842a19b765a4225e10a27a6eaa575b1ff25d086d383b9f419d6beb8b0c43b59df44dc4b8447deb56a81d438665b689b4
+MISC ChangeLog 43896 SHA256 4e20216fd0b567ae59fce7da434fb944456e465baea1ec1ca08d7157b69f0609 SHA512 65f82018d0fe0d7c4ace8c7a895688c3a65f3eb526f736746cf7251d26be4e21af7522172b340965c757ec5a422f759543182c98f4b98589ac6742124029b5dc WHIRLPOOL d56ff186b0b9f60f99896c3438701246d7790f55e8430d8d45a7d77947f65b0259b7e0500318c7fcd250a1ab7ced10a92e8500e16b5089bf1139dbf21aeecaae
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUXl/wAAoJEPGu1DbS6WIAe8MP+wbQd3+8CLzVtVaFzjtM1aNi
-FzBOWYYxy8IvJGTWxBKDg611qrrbQP9az+fxoRjMTtcOYFvl0ZXxXUROlQ9fyosm
-ssyEVk6wDNmT0LsVjlju5ssiJgfyLRLtcR5x0CKCIyATYZbNFxXm0hG6fgvwasd3
-vgQIp+byPaKThe+sgPJK4QVrrSPhtVIfEHogmZn8MYZGO6o+yl95XWNlIL6oelb5
-9W7bVhSYjGxra5vOYyjF9UbcLb3w131rikBVuFBgjDT7D81BPwQGk9oWFRhI+nDo
-a/1/M4oDN7JaCRybu4FIKenw1FEGLc9yKUMdsCAJRJlLu78RuP7zqhDN3/0MtH7f
-8t10YlQpyTsZ6xHA53WFWr6ESqsx7YoViqB2SFtFk5NaJZ4fhMommJHy2Nvh6nVu
-HinXQb5Y8DcHnXv/q2N+fQ7DO/Ecg2GRa0FymSoRP+OASJGqrNvxvV8xl0lmVFCc
-h908ebPC/GMExVLBrqG3PMATPwNpHeN38obxrgz8IGSrv6tsSuZAGL74OO+wDeae
-KjKkWiaNSteD0h7leql3yq0r0dFmilBxDWkejvjyfTBnLzBMQUf7R2SjcSzmtjxq
-UV0pkZEVWRDCPU5Uh40wf8jyMF5m/lFQSbfn8ZpVOjJlTbSYLFSJhbC7DiT4aO7/
-HUocfwYFcfqgTvqil+7F
-=HdAx
+iEYEAREIAAYFAlTVYy0ACgkQblQW9DDEZTjbawCfdBGY5XxXeIeKSdluJ2TSfQ4t
+GNcAni8dQprk/U3wJbDVeIkEMszSjEwc
+=cZIG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index 14c0b6af29f7..598edfb1e684 100755
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.2 2012/11/11 21:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.3 2015/02/07 00:58:12 williamh Exp $
 
 extra_commands="configtest"
 
@@ -9,7 +9,7 @@ extra_commands="configtest"
 
 depend() {
 	need net
-	use logger dns #@slapd@
+	use logger dns 
 }
 
 get_var() {
@@ -92,12 +92,13 @@ start() {
 		-user dhcp -group dhcp \
 		${chroot:+-chroot} ${chroot} ${DHCPD_IFACE}
 	eend $? \
-		&& save_options chroot "${chroot}" \
+		&& save_options dhcpcd_chroot "${chroot}" \
 		&& save_options pidfile "${pidfile}"
 }
 
 stop() {
-	local chroot="$(get_options chroot)"
+	local chroot="$(get_options dhcpd_chroot)"
+	[ -z "$chroot" && chroot="$(get_options chroot)"
 
 	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
 	start-stop-daemon --stop --exec /usr/sbin/dhcpd \