diff options
author | Darren 'Tadgy' Austin <darren@afterdark.org.uk> | 2018-07-25 16:37:15 +0100 |
---|---|---|
committer | Robby Workman <rworkman@slackware.com> | 2018-11-25 14:17:50 -0600 |
commit | 2e95f250e5634b3c6e5a1a9d13a0e3a3310dc566 (patch) | |
tree | e4341a2e6cce21848ef0619f677ea0415e0ebf82 | |
parent | fe0c8a2406fe413248073159883b7e531ccc5496 (diff) | |
download | slacknetsetup-2e95f250e5634b3c6e5a1a9d13a0e3a3310dc566.tar.xz |
Account for IPv6 addresses in determination of interface status
Signed-off-by: Robby Workman <rworkman@slackware.com>
-rw-r--r-- | rc.inet1 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -155,8 +155,8 @@ if_up() { fi fi if [ -e /sys/class/net/${1%%:*} ]; then # interface exists - if ! /sbin/ip address show dev ${1} 2>/dev/null | grep -wq inet || \ - ! /sbin/ip link show dev ${1} | grep -wq "state UP" ; then # interface not up or not configured + if ! /sbin/ip address show permanent scope global dev ${1} 2>/dev/null | grep -Ewq '(inet|inet6)' || \ + ! /sbin/ip link show dev ${1} | grep -wq "state UP" ; then # interface not up or not configured if [ -n "${HWADDR[$i]}" ]; then # Set hardware address _before_ the interface goes up: echo "/etc/rc.d/rc.inet1: /sbin/ip link set dev ${1} address ${HWADDR[$i]}" | $LOGGER /sbin/ip link set dev ${1} address ${HWADDR[$i]} |