diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/ifup b/packages/base/all/initrds/loader-initrd-files/src/bin/ifup index 453a55c9..434b32f5 100644 --- a/packages/base/all/initrds/loader-initrd-files/src/bin/ifup +++ b/packages/base/all/initrds/loader-initrd-files/src/bin/ifup @@ -81,6 +81,9 @@ case "${NETAUTO}" in up) ifconfig "${NETDEV}" up ;; + none) + exit 0 + ;; *) if [ "${NETIP}" ] && [ "${NETMASK}" ] && [ "${NETIP#*/}" = "${NETIP}" ]; then NETIP=${NETIP}/$(ipcalc -p -s ${NETIP} ${NETMASK} | sed -n 's/PREFIX=//p') @@ -118,6 +121,7 @@ for i in $(seq 30); do fi sleep 1 done + wait_link_up() { local intf=$1 @@ -144,4 +148,5 @@ wait_link_up() if [ -n "${NETAUTO}" ]; then wait_link_up $NETDEV 100 fi -return 0 + +exit 0 diff --git a/packages/base/all/vendor-config-onl/src/python/onl/bootconfig/__init__.py b/packages/base/all/vendor-config-onl/src/python/onl/bootconfig/__init__.py index 1e2ba00c..e85c9ca0 100755 --- a/packages/base/all/vendor-config-onl/src/python/onl/bootconfig/__init__.py +++ b/packages/base/all/vendor-config-onl/src/python/onl/bootconfig/__init__.py @@ -191,7 +191,7 @@ class OnlBootConfigNet(OnlBootConfig): if not self.is_ip_address(netdns): raise ValueError("NETDNS=%s is not a valid ip-address" % (netdns)) - elif self.keys['NETAUTO'] not in ['dhcp', 'up', '']: + elif self.keys['NETAUTO'] not in ['dhcp', 'up', 'none', '']: raise ValueError("The NETAUTO value '%s' is invalid." % self.keys['NETAUTO']) elif self.keys['NETAUTO'] == 'up' and self.NET_REQUIRED: raise ValueError("NETAUTO is 'up' but non-local networking is required.")