diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-05-11 14:58:34 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-05-11 14:58:34 +0000 |
| commit | 045da5893457e7687c38986a8072c11ee570f382 (patch) | |
| tree | 51167b70a29d3ca5030f66e41f7c57c4bd3c7be5 /net-misc | |
| parent | Added patch to fix openal/freealut using upstream released versions and closi... (diff) | |
| download | gentoo-2-045da5893457e7687c38986a8072c11ee570f382.tar.gz gentoo-2-045da5893457e7687c38986a8072c11ee570f382.tar.bz2 gentoo-2-045da5893457e7687c38986a8072c11ee570f382.zip | |
Fixed chroot pidfile handling
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcpd.init | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index cefd6aeb05bc..3e4b33dafa5f 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,9 +1,10 @@ # ChangeLog for net-misc/dhcp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.95 2006/05/11 14:36:11 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.96 2006/05/11 14:58:34 uberlord Exp $ - 11 May 2006; Roy Marples <uberlord@gentoo.org> files/dhcpd.conf: - Fixed typo in conf.d/dhcpd, #133019 thanks to Hod. + 11 May 2006; Roy Marples <uberlord@gentoo.org> files/dhcpd.conf, + files/dhcpd.init: + Fixed typo in conf.d/dhcpd and fixed chroot pidfile, #133019 thanks to Hod. 10 May 2006; Roy Marples <uberlord@gentoo.org> files/dhcp-3.0.3-dhclient-metric.patch, diff --git a/net-misc/dhcp/files/dhcpd.init b/net-misc/dhcp/files/dhcpd.init index 61b83a43c32f..e9b6e0b8f156 100644 --- a/net-misc/dhcp/files/dhcpd.init +++ b/net-misc/dhcp/files/dhcpd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.2 2006/03/01 09:47:30 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.3 2006/05/11 14:58:34 uberlord Exp $ DHCPD_CONF="/etc/dhcp/dhcpd.conf" @@ -62,10 +62,10 @@ start() { } stop() { - local chrooted="" - [[ -n $(get_options chroot) ]] && chrooted="chrooted " - ebegin "Stopping ${chrooted}${SVCNAME}" + local chroot="$(get_options chroot)" + + ebegin "Stopping ${chroot:+chrooted }${SVCNAME}" start-stop-daemon --stop --exec /usr/sbin/dhcpd \ - --pidfile "$(get_options pidfile)" + --pidfile "${chroot}/$(get_options pidfile)" eend $? } |