commit 19364cb6e376f10440837b92fb59a6eaad6d6d93 Author: Edvinas Valatka Date: Fri Oct 7 02:09:38 2011 +0300 bugfix FS#26306 diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 2238d45..c622fb1 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -786,7 +786,7 @@ If any previous configuration you've done until now (like fancy filesystems) req # returns: 1 on failure interactive_runtime_network() { local ifaces - ifaces=$(ifconfig -a |grep "Link encap:Ethernet"|sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g') + ifaces=$(ip -o link show|grep ether| awk '{print $2, " ", $13}' | sed 's/: / /g') [ -z "$ifaces" ] && show_warning "No network interfaces?" "Cannot find any ethernet interfaces. This usually means udev was\nunable to load the module and you must do it yourself. Switch to\nanother VT, load the appropriate module, and run this step again." && return 1 @@ -805,8 +805,8 @@ interactive_runtime_network() { show_warning "Dhcpcd problem" "Failed to run dhcpcd. See $LOG for details." return 1 fi - if ! ifconfig $INTERFACE | grep -q 'inet addr:' - then + if ! ip -o addr show dev $INTERFACE | grep -q ' inet ' + then show_warning "Dhcpcd problem" "DHCP request failed. dhcpcd returned 0 but no ip configured for $INTERFACE" return 1 fi