williamh 15/02/07 00:58:12 Modified: dhcpd.init5 Log: 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. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path 1.3 net-misc/dhcp/files/dhcpd.init5 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.init5?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.init5?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.init5?r1=1.2&r2=1.3 Index: dhcpd.init5 =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dhcpd.init5 11 Nov 2012 21:42:02 -0000 1.2 +++ dhcpd.init5 7 Feb 2015 00:58:12 -0000 1.3 @@ -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 @@ depend() { need net - use logger dns #@slapd@ + use logger dns } get_var() { @@ -92,12 +92,13 @@ -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 \
