summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-02-17 10:47:44 +0000
committerChristian Heim <phreak@gentoo.org>2006-02-17 10:47:44 +0000
commitc8495ddb57e7e4243721479a9c19602842a623cf (patch)
treed59e1183c75846817a76ea6a2836ca40c7523d88 /net-scripts/net.modules.d/helpers.d/dhcp
parentMerging r1881 (diff)
downloadbaselayout-vserver-c8495ddb57e7e4243721479a9c19602842a623cf.tar.gz
baselayout-vserver-c8495ddb57e7e4243721479a9c19602842a623cf.tar.bz2
baselayout-vserver-c8495ddb57e7e4243721479a9c19602842a623cf.zip
Merging r1909
svn path=/baselayout-vserver/trunk/; revision=237
Diffstat (limited to 'net-scripts/net.modules.d/helpers.d/dhcp')
-rwxr-xr-xnet-scripts/net.modules.d/helpers.d/dhcp4
1 files changed, 2 insertions, 2 deletions
diff --git a/net-scripts/net.modules.d/helpers.d/dhcp b/net-scripts/net.modules.d/helpers.d/dhcp
index 35d6775..ceb2d60 100755
--- a/net-scripts/net.modules.d/helpers.d/dhcp
+++ b/net-scripts/net.modules.d/helpers.d/dhcp
@@ -20,7 +20,7 @@ case "${action}" in
deconfig|leasefail)
# Just remove IPv4 / inet addresses
interface_del_addresses "${interface}" true
- service_started "${service}" && mark_service_inactive "net.${interface}"
+ service_started "${service}" && mark_service_inactive "${service}"
remove_state "${interface}"
if [[ ${RC_AUTO_INTERFACE} == "yes" ]]; then
best_interface=$( select_best_interface )
@@ -115,7 +115,7 @@ else
apply_state "${interface}"
fi
-! service_stopping "${service}" && mark_service_started "${service}"
+service_inactive "${service}" && mark_service_started "${service}"
echo "${action}"
exit 0