diff options
| author |   Christian Heim <phreak@gentoo.org> | 2005-12-22 09:40:51 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2005-12-22 09:40:51 +0000 |
| commit | c1395f64105640981658134855c899bc316c72c7 (patch) | |
| tree | bac28abd4d8d23f57ada16511c4aa2115b8ecd57 /net-scripts/net.modules.d/dhclient | |
| parent | fix devpts for openvz (diff) | |
| download | baselayout-vserver-c1395f64105640981658134855c899bc316c72c7.tar.gz baselayout-vserver-c1395f64105640981658134855c899bc316c72c7.tar.bz2 baselayout-vserver-c1395f64105640981658134855c899bc316c72c7.zip | |
Importing latest baselayout/trunk changes. This is a merge with revision 1768.
svn path=/baselayout-vserver/trunk/; revision=177
Diffstat (limited to 'net-scripts/net.modules.d/dhclient')
| -rw-r--r-- | net-scripts/net.modules.d/dhclient | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net-scripts/net.modules.d/dhclient b/net-scripts/net.modules.d/dhclient index 4754628..91a751a 100644 --- a/net-scripts/net.modules.d/dhclient +++ b/net-scripts/net.modules.d/dhclient @@ -135,18 +135,13 @@ dhclient_start() { # Bring up DHCP for this interface (or alias) ebegin "Running dhclient" - - # Stop dhclient if it's already running - dhclient_stop "${iface}" - local x=$( eval dhclient "${opts}" -1 -pf "${pidfile}" \ -sf "${MODULES_DIR}/helpers.d/dhclient-wrapper" -q "${iface}" 2>&1 ) # We just check the last 5 letters [[ ${x:${#x} - 5:5} == "bound" ]] if [[ $? != "0" ]]; then echo "${x}" - # We need to kill the process if we fail - [[ -e ${pidfile} ]] && kill -s TERM $( < "${pidfile}" ) 2>/dev/null + dhclient_stop "${iface}" &>/dev/null eend 1 return 1 fi |