From 0106c6a542aba30443bfc88aede78244dd60fd63 Mon Sep 17 00:00:00 2001 From: Sergey Popovich Date: Mon, 6 Aug 2018 08:38:29 +0300 Subject: [PATCH] onl-boot-config: Support empty NETAUTO Since empty NETAUTO= in /mnt/onl/boot/boot-config is valud according to rules in initramfs /boot/ifup, follow this behavior in onl-boot-config to get rid of incorrect message: root@localhost:/# onl-boot-config --show NETDEV=ma1 BOOTMODE=INSTALLED SWI=images::latest NETAUTO= The NETAUTO value '' is invalid. The boot configuration has not been changed. Signed-off-by: Sergey Popovich --- .../all/vendor-config-onl/src/python/onl/bootconfig/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f64677ea..1e2ba00c 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', '']: 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.")