diff options
| author |   Christian Heim <phreak@gentoo.org> | 2005-12-22 09:21:39 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2005-12-22 09:21:39 +0000 |
| commit | 489228bf1b7061469ec79fed2550aa460c8575a6 (patch) | |
| tree | 7ee277c9216a1eb13d899fc5e6c2702a05a57925 /net-scripts/net.modules.d/helpers.d/dhcp | |
| parent | fix devpts for openvz (diff) | |
| download | baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.tar.gz baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.tar.bz2 baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.zip | |
Merging latest changes to the baselayout branch. This merge is based upon revision 1767.
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=175
Diffstat (limited to 'net-scripts/net.modules.d/helpers.d/dhcp')
| -rwxr-xr-x | net-scripts/net.modules.d/helpers.d/dhcp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net-scripts/net.modules.d/helpers.d/dhcp b/net-scripts/net.modules.d/helpers.d/dhcp index 52998ca..bb96565 100755 --- a/net-scripts/net.modules.d/helpers.d/dhcp +++ b/net-scripts/net.modules.d/helpers.d/dhcp @@ -17,12 +17,10 @@ case "${action}" in bound|renew) # We handle these actions below ;; - deconfig) + deconfig|leasefail) # Just remove IPv4 / inet addresses interface_del_addresses "${interface}" true - if service_starting "${service}" || service_started "${service}" ; then - mark_service_inactive "net.${interface}" - fi + service_started "${service}" && mark_service_inactive "net.${interface}" remove_state "${interface}" if [[ ${RC_AUTO_INTERFACE} == "yes" ]]; then best_interface=$( select_best_interface ) @@ -35,13 +33,6 @@ case "${action}" in echo "${action}" exit 0 ;; - leasefail) - if service_starting "${service}" || service_started "${service}" ; then - mark_service_inactive "net.${interface}" - fi - echo "${action}" - exit 0 - ;; *) echo "${action}" echo "We don't handle that action" >&2 |