diff options
| author |   William Hubbs <williamh@gentoo.org> | 2015-02-07 00:58:12 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2015-02-07 00:58:12 +0000 |
| commit | 2708d62d5f14fb19d54613c983ed2adaa4bcb9c0 (patch) | |
| tree | 98c0bd6b33f7496e7690be98d1cecc5985656ba6 /net-misc/dhcp | |
| parent | Fixed DoS vulnerability. bug #539164 (diff) | |
| download | gentoo-2-2708d62d5f14fb19d54613c983ed2adaa4bcb9c0.tar.gz gentoo-2-2708d62d5f14fb19d54613c983ed2adaa4bcb9c0.tar.bz2 gentoo-2-2708d62d5f14fb19d54613c983ed2adaa4bcb9c0.zip | |
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)
Diffstat (limited to 'net-misc/dhcp')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 9 | ||||
| -rwxr-xr-x | net-misc/dhcp/files/dhcpd.init5 | 11 |
2 files changed, 13 insertions, 7 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/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 \ |