From e21d14549ba59d1e557b84b7917309c961d85030 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 29 Nov 2016 17:40:05 +0000 Subject: [PATCH] - Mount the ONL-BOOT context before accessing the default boot-config. --- .../src/python/onl/bootconfig/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 61a00774..a5dde0f0 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 @@ -20,9 +20,12 @@ class OnlBootConfig(object): self._original = self.keys.copy() def read(self, bc=None): - if bc is None: - bc = self.BOOT_CONFIG_DEFAULT - self._readf(bc) + if bc: + self._readf(bc) + else: + from onl.mounts import OnlMountContextReadOnly + with OnlMountContextReadOnly("ONL-BOOT", logger=None): + self._readf(self.BOOT_CONFIG_DEFAULT) def set(self, k, v): self.keys[k] = v @@ -151,7 +154,7 @@ class OnlBootConfigNet(OnlBootConfig): elif self.keys['NETAUTO'] not in ['dhcp', 'up']: raise ValueError("The NETAUTO value '%s' is invalid." % self.keys['NETAUTO']) - elif self.keys['NETAUTO'] == 'up' && self.NET_REQUIRED: + elif self.keys['NETAUTO'] == 'up' and self.NET_REQUIRED: raise ValueError("NETAUTO is 'up' but non-local networking is required.") if 'NETDEV' not in self.keys: