scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working for x86

Browse Source
This commit is contained in:
Carl D. Roth
2016-11-09 12:38:18 -08:00
parent 4c9c1fa745
commit 46c8c0a0be
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py
View File

@@ -571,7 +571,8 @@ class GrubInstaller(SubprocessMixin, Base):
with MountContext(dev.device, log=self.log) as ctx:
d = os.path.join(ctx.dir, "grub")
self.makedirs(d)
if not os.path.exists(d):
self.makedirs(d)
dst = os.path.join(ctx.dir, 'grub/grub.cfg')
with open(dst, "w") as fd:
fd.write(cf)
@@ -663,8 +664,7 @@ class GrubInstaller(SubprocessMixin, Base):
def upgradeBootLoader(self):
"""Upgrade the boot loader settings."""
code = self.findGpt()
if code: return code
self.blkidParts = BlkidParser(log=self.log.getChild("blkid"))
code = self.installGrubCfg()
if code: return code
@@ -909,13 +909,6 @@ class UbootInstaller(SubprocessMixin, Base):
def upgradeBootLoader(self):
"""Upgrade the boot loader settings as part of a loader upgrade."""
self.partedDevice = parted.getDevice(self.device)
self.partedDisk = parted.newDisk(self.partedDevice)
if self.partedDisk.type != 'msdos':
self.log.error("disk %s has wrong label %s",
self.device, self.partedDisk.type)
return 1
self.blkidParts = BlkidParser(log=self.log.getChild("blkid"))
# XXX boot-config (and saved boot-config) should be unchanged during loader upgrade