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

Populate the ONL-CONFIG partition with a README.

Browse Source 
- This is mostly infrastructure prove-out.
This commit is contained in:
Jeffrey Townsend
2016-08-12 19:03:04 +00:00
parent e508a8160b
commit 2e7df5b080
9 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builds/amd64/installer/installed/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

2
builds/amd64/installer/swi/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

2
builds/any/installer/grub/builds/Makefile
View File

@@ -11,7 +11,7 @@ include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
__installer:
$(ONL)/tools/mkinstaller.py --arch $(ARCH) --boot-config boot-config --initrd onl-loader-initrd:$(ARCH) onl-loader-initrd-$(ARCH).cpio.gz --swi onl-swi:$(ARCH) --out $(INSTALLER_NAME)
$(ONL)/tools/mkinstaller.py --arch $(ARCH) --boot-config boot-config --add-dir config --initrd onl-loader-initrd:$(ARCH) onl-loader-initrd-$(ARCH).cpio.gz --swi onl-swi:$(ARCH) --out $(INSTALLER_NAME)
md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"

2
builds/any/installer/uboot/builds/Makefile
View File

@@ -11,7 +11,7 @@ include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
__installer:
$(ONL)/tools/mkinstaller.py --arch $(ARCH) --boot-config boot-config --fit onl-loader-fit:$(ARCH) onl-loader-fit.itb --swi onl-swi:$(ARCH) --out $(INSTALLER_NAME)
$(ONL)/tools/mkinstaller.py --arch $(ARCH) --boot-config boot-config --add-dir config --fit onl-loader-fit:$(ARCH) onl-loader-fit.itb --swi onl-swi:$(ARCH) --out $(INSTALLER_NAME)
md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"

2
builds/armel/installer/installed/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

2
builds/armel/installer/swi/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

2
builds/powerpc/installer/installed/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

2
builds/powerpc/installer/swi/builds/config/README Normal file
View File

@@ -0,0 +1,2 @@
This partition contains system configuration data that is persistant across installations and upgrades of ONL-based systems.

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

@@ -357,6 +357,24 @@ class Base:
return 0
def installOnlConfig(self):
try:
dev = self.blkidParts['ONL-CONFIG']
except IndexError as ex:
self.log.warn("cannot find ONL-CONFIG partition : %s", str(ex))
return 1
with MountContext(dev.device, log=self.log) as ctx:
for f in self.zf.namelist():
d = 'config/'
if f.startswith(d) and f != d:
dst = os.path.join(ctx.dir, os.path.basename(f))
if not os.path.exists(dst):
self.installerCopy(f, dst)
return 0
def assertUnmounted(self):
"""Make sure the install device does not have any active mounts."""
pm = ProcMountsParser()
@@ -595,6 +613,9 @@ class GrubInstaller(SubprocessMixin, Base):
code = self.installBootConfig()
if code: return code
code = self.installOnlConfig()
if code: return code
code = self.installGrub()
if code: return code