|
Lines 291-296
esac
Link Here
|
| 291 |
|
291 |
|
| 292 |
|
292 |
|
| 293 |
start_dhcp4_dhcpcd() { |
293 |
start_dhcp4_dhcpcd() { |
|
|
294 |
renew=$1 |
| 295 |
|
| 294 |
# |
296 |
# |
| 295 |
# Using netconfig, we can request all options and |
297 |
# Using netconfig, we can request all options and |
| 296 |
# netconfig takes care to apply them properlly... |
298 |
# netconfig takes care to apply them properlly... |
|
Lines 332-341
start_dhcp4_dhcpcd() {
Link Here
|
| 332 |
args="$args${DHCLIENT_VENDOR_CLASS_ID:+ -i \"$DHCLIENT_VENDOR_CLASS_ID\"}" |
334 |
args="$args${DHCLIENT_VENDOR_CLASS_ID:+ -i \"$DHCLIENT_VENDOR_CLASS_ID\"}" |
| 333 |
args="$args${DHCLIENT_LEASE_TIME:+ -l \"$DHCLIENT_LEASE_TIME\"}" |
335 |
args="$args${DHCLIENT_LEASE_TIME:+ -l \"$DHCLIENT_LEASE_TIME\"}" |
| 334 |
args="$args${DHCLIENT_HOSTNAME_OPTION:+ -h \"$DHCLIENT_HOSTNAME_OPTION\"}" |
336 |
args="$args${DHCLIENT_HOSTNAME_OPTION:+ -h \"$DHCLIENT_HOSTNAME_OPTION\"}" |
| 335 |
debug "Starting dhcp client: $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $args $INTERFACE" |
337 |
debug "Starting dhcp client: $DHCLIENT_BIN $renew $DHCPCD_USER_OPTIONS $args $INTERFACE" |
| 336 |
|
338 |
|
| 337 |
# now start dhcpcd |
339 |
# now start dhcpcd |
| 338 |
$DHCLIENT_BIN $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \ |
340 |
$DHCLIENT_BIN $renew $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \ |
| 339 |
${DHCLIENT_TIMEOUT:+-t "$DHCLIENT_TIMEOUT"} \ |
341 |
${DHCLIENT_TIMEOUT:+-t "$DHCLIENT_TIMEOUT"} \ |
| 340 |
${DHCLIENT_CLIENT_ID:+-I "$DHCLIENT_CLIENT_ID"} \ |
342 |
${DHCLIENT_CLIENT_ID:+-I "$DHCLIENT_CLIENT_ID"} \ |
| 341 |
${DHCLIENT_VENDOR_CLASS_ID:+-i "$DHCLIENT_VENDOR_CLASS_ID"} \ |
343 |
${DHCLIENT_VENDOR_CLASS_ID:+-i "$DHCLIENT_VENDOR_CLASS_ID"} \ |
|
Lines 632-645
case "$ACTION" in
Link Here
|
| 632 |
# reset dhcp4 status |
634 |
# reset dhcp4 status |
| 633 |
DHCP4_STATUS="" |
635 |
DHCP4_STATUS="" |
| 634 |
case "$DHCLIENT" in |
636 |
case "$DHCLIENT" in |
| 635 |
(dhcpcd|dhclient) |
637 |
(dhcpcd) ;; |
|
|
638 |
(dhclient) |
| 639 |
DHCP4_STATUS="" |
| 636 |
$DHCLIENT_BIN -x $INTERFACE |
640 |
$DHCLIENT_BIN -x $INTERFACE |
|
|
641 |
sleep 1 |
| 642 |
for i in `dhcpc4_on_iface`; do |
| 643 |
kill -TERM $i &>/dev/null |
| 644 |
done |
| 645 |
sleep 1 |
| 637 |
;; |
646 |
;; |
| 638 |
esac |
647 |
esac |
| 639 |
for i in `dhcpc4_on_iface`; do |
|
|
| 640 |
kill -TERM $i &>/dev/null |
| 641 |
done |
| 642 |
sleep 1 |
| 643 |
;; |
648 |
;; |
| 644 |
(dhcp6) |
649 |
(dhcp6) |
| 645 |
# reset dhcp6 status |
650 |
# reset dhcp6 status |
|
Lines 710-716
case "$ACTION" in
Link Here
|
| 710 |
case "$DHCLIENT" in |
715 |
case "$DHCLIENT" in |
| 711 |
(dhcpcd) |
716 |
(dhcpcd) |
| 712 |
test -n "$DHCP4_STATUS" || { |
717 |
test -n "$DHCP4_STATUS" || { |
| 713 |
start_dhcp4_dhcpcd && { |
718 |
test "$ACTION" = renew && renew='--renew' || renew='' |
|
|
719 |
start_dhcp4_dhcpcd $renew && { |
| 714 |
DHCP4_STARTED="yes" |
720 |
DHCP4_STARTED="yes" |
| 715 |
write_cached_config_data dhcp4_client $DHCLIENT $INTERFACE |
721 |
write_cached_config_data dhcp4_client $DHCLIENT $INTERFACE |
| 716 |
write_cached_config_data dhcp4_state started $INTERFACE |
722 |
write_cached_config_data dhcp4_state started $INTERFACE |
| 717 |
- |
|
|