Use proper pid file and directory. Fixes bug #35751.

5 files changed, 18 insertions, 15 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index c16e02499983..313d9f705e54 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.31 2004/01/15 01:04:44 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.32 2004/01/15 01:15:04 max Exp $
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
+  files/dhcp.rc6, files/dhcrelay.rc6:
+  Use proper pid file and directory. Fixes bug #35751.
 
   14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
   files/dhcp.conf, files/dhcp.rc6, files/dhcrelay.conf, files/dhcrelay.rc6:
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 089efce2445c..1a1bf1e23cdc 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,17 +1,17 @@
-MD5 ce05257958cfae0bfbde0a232b1dfa17 dhcp-3.0_p2-r3.ebuild 3982
-MD5 fc1ebdd22fe7c72c34248dd1f190c926 ChangeLog 5301
+MD5 e6afc9f8ac4355426c5adf175d5f07e8 dhcp-3.0_p2-r3.ebuild 3992
+MD5 4d27d888bfea9a38368c376117232f15 ChangeLog 5461
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
 MD5 ffd9effc7435762698d37e09ad8fff16 dhcp-3.0_p2-r2.ebuild 3841
 MD5 2688d353bf0ff8abf3789129a4a2b2b2 dhcp-3.0_p2.ebuild 2744
 MD5 8d98ca755a443b878d397120f7088f7d files/dhcp.conf 648
 MD5 498a3eb0e9deaf705f17fff3834f5b90 files/dhclient.c-3.0-dw-cli-fix.patch 734
-MD5 96acf4633ae7ce268cd5a01b460ecfdd files/dhcrelay.rc6 619
+MD5 695a2fd068a21660383e8cc36edef490 files/dhcrelay.rc6 585
 MD5 ff4bf18624d479599da15878fdef65fe files/conf.dhcpd 401
 MD5 d6ae01f5dcc87b11d4d96a34e7cc52a3 files/digest-dhcp-3.0_p2 63
 MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r2 129
 MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r3 129
 MD5 52c69c00f7dcab328fa39f954fadc766 files/dhcrelay.conf 519
-MD5 1433b0173611528a665e975820bfa52d files/dhcp.rc6 1105
+MD5 e8423c5594b48e4d8edfe0798f76bcb8 files/dhcp.rc6 1135
 MD5 be72fa691b23c9e82cc4567a1a035cfc files/dhcp.rc7 811
 MD5 28ebabb4ad513afb04314634ecd9db25 files/dhcp-3.0pl2-user-option-fix.patch 1519
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
index 038f278649bf..b845b5021457 100644
--- a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild,v 1.3 2004/01/15 01:04:44 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild,v 1.4 2004/01/15 01:15:04 max Exp $
 
 inherit eutils flag-o-matic
 
@@ -111,10 +111,10 @@ pkg_config() {
 
 	if [ ! -d "${CHROOT:=/chroot/dhcp}" ] ; then
 		ebegin "Setting up the chroot directory"
-		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run}
+		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
 		cp -R /etc/dhcp "${CHROOT}/etc/"
 		cp -R /var/lib/dhcp "${CHROOT}/var/lib"
-		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run"
+		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run/dhcp"
 		eend
 
 		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/dhcp`" ] ; then
diff --git a/net-misc/dhcp/files/dhcp.rc6 b/net-misc/dhcp/files/dhcp.rc6
index 7723d7163216..0c1a75cfd499 100644
--- a/net-misc/dhcp/files/dhcp.rc6
+++ b/net-misc/dhcp/files/dhcp.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.9 2004/01/15 01:04:51 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.10 2004/01/15 01:15:07 max Exp $
 
 depend() {
 	need net
@@ -38,6 +38,7 @@ start() {
 
 stop() {
 	ebegin "Stopping dhcpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/dhcp/dhcpd.pid
+	start-stop-daemon --stop --quiet --pidfile \
+                "${CHROOT}/var/run/dhcp/dhcpd.pid"
 	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcrelay.rc6 b/net-misc/dhcp/files/dhcrelay.rc6
index 76e129c29c99..e4b9d75e46b6 100644
--- a/net-misc/dhcp/files/dhcrelay.rc6
+++ b/net-misc/dhcp/files/dhcrelay.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.1 2004/01/15 01:04:51 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.2 2004/01/15 01:15:07 max Exp $
 
 depend() {
 	need net
@@ -10,9 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting dhcrelay"
-	start-stop-daemon --start --quiet \
-	--pidfile /var/run/dhcrelay.pid  \
-	--exec /usr/sbin/dhcrelay \
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcrelay \
 		-- -q -i ${IFACE} ${DHCRELAY_OPTS} \
         	${DHCRELAY_SERVERS}
 	eend $?
@@ -20,6 +18,6 @@ start() {
 
 stop() {
 	ebegin "Stopping dhcrelay"
-	start-stop-daemon --stop --quiet --pidfile /var/run/dhcrelay.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/dhcp/dhcrelay.pid
 	eend $?
 }