diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2005-12-07 14:51:08 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2005-12-07 14:51:08 +0000 |
| commit | 6525275dba9c2657b63c7b326b7fe6a6b496488f (patch) | |
| tree | d788f7005f2870643b3b5e5ce032a7d0f362a854 /net-misc | |
| parent | Block virtual/pcmcia. (diff) | |
| download | historical-6525275dba9c2657b63c7b326b7fe6a6b496488f.tar.gz historical-6525275dba9c2657b63c7b326b7fe6a6b496488f.tar.bz2 historical-6525275dba9c2657b63c7b326b7fe6a6b496488f.zip | |
Fix init script for correct pidfile path
Package-Manager: portage-2.0.53
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcp/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp.init | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index dc03fcb5e2e3..82aec96e1422 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -8,7 +8,7 @@ MD5 d0f61288e81ce020573f3f6965af8489 files/dhcp-3.0.2-gmake.patch 1872 MD5 2bfa28477aff891d25c06a00677d261c files/dhcp-3.0.3-libdst.patch 322 MD5 ce6d18eef914ac8a39b0cb1bc4d63de2 files/dhcp-3.0.3-tr.patch 377 MD5 2a2635a76ada362d73f6c004a31199d0 files/dhcp.conf 952 -MD5 8825c027fbef1544e663d5a5f4cf6cd1 files/dhcp.init 1339 +MD5 f775722495bb9a24d6558956b654ab44 files/dhcp.init 1410 MD5 81b9256728a5daab31f0513ab55e8354 files/dhcp.rc6 1092 MD5 02ea0c813e6dae9194379a195fa56e0c files/dhcrelay.conf 564 MD5 6e2bc3e08290c60d4f339ab9182fce07 files/dhcrelay.init 748 diff --git a/net-misc/dhcp/files/dhcp.init b/net-misc/dhcp/files/dhcp.init index 784b7ccf8690..fb3a705d7daf 100644 --- a/net-misc/dhcp/files/dhcp.init +++ b/net-misc/dhcp/files/dhcp.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.init,v 1.1 2005/12/07 13:59:32 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.init,v 1.2 2005/12/07 14:51:08 uberlord Exp $ depend() { need net @@ -32,10 +32,11 @@ start() { [[ -n ${LD_PRELOAD} ]] && export LD_PRELOAD="${LD_PRELOAD}" local pidfile=$(get_var pid-file-name) - pidfile="${pidfile:-/var/run/dhcp.pid}" + pidfile="${pidfile:-/var/run/dhcp/dhcp.pid}" ebegin "Starting ${CHROOT:+chrooted }dhcpd" eval start-stop-daemon --start --exec /usr/sbin/dhcpd \ + --pidfile "${CHROOT}${pidfile}" \ -- -q -pf "${pidfile}" \ -user dhcp -group dhcp "${DHCPD_OPTS}" \ ${CHROOT:+-chroot "${CHROOT}"} "${IFACE}" @@ -44,6 +45,7 @@ start() { stop() { ebegin "Stopping dhcpd" - start-stop-daemon --stop --pidfile "$(get_options pidfile)" + start-stop-daemon --stop --exec /usr/sbin/dhcpd \ + --pidfile "$(get_options pidfile)" eend $? } |