scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2026-01-09 16:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Mount the ONL-BOOT context before accessing the default boot-config.

Browse Source
This commit is contained in:
Jeffrey Townsend
2016-11-29 17:40:05 +00:00
parent f10add085e
commit e21d14549b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/base/all/vendor-config-onl/src/python/onl/bootconfig/__init__.py
View File

@@ -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: