From b9ebdbc16168dede9912bf359149856aa861f689 Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Sat, 28 Jul 2018 04:25:03 +0100 Subject: Update early skipping of unconfigured interfaces check Signed-off-by: Robby Workman --- rc.inet1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'rc.inet1') diff --git a/rc.inet1 b/rc.inet1 index e9e0b58..8c543ed 100644 --- a/rc.inet1 +++ b/rc.inet1 @@ -142,12 +142,14 @@ if_up() { fi # If the interface is a bridge, then create it first: [ -n "${BRNICS[$i]}" ] && br_open $i - # If the interface isn't in the kernel yet (but there's an alias for it in - # modules.conf), then it should be loaded first: - if [ -z "${IPADDR[$i]}" ] && [ "${USE_DHCP[$i]}" != "yes" ]; then # skip unconfigured interfaces + # Skip unconfigured interfaces: + if [ -z "${IPADDR[$i]}" ] && [ "${USE_DHCP[$i]}" != "yes" ] && [ -z "${IPADDR6[$i]}" ] && \ + [ "${USE_DHCP6[$i]}" != "yes" ] && [ "${USE_STATELESS[$i]}" != "yes" ]; then debug_log "skipping ${1} early, interface is not configured in /etc/rc.d/rc.inet1.conf" return 0 fi + # If the interface isn't in the kernel yet (but there's an alias for it in + # modules.conf), then it should be loaded first: if [ ! -e /sys/class/net/${1%%:*} ]; then # no interface yet if /sbin/modprobe -c | grep -v "^#" | grep -w "alias ${1}" | grep -vw "alias ${1} off" > /dev/null ; then echo "/etc/rc.d/rc.inet1: /sbin/modprobe ${1}" | $LOGGER -- cgit v1.2.3