From ed3f6adcfb6da0abaad43549fb87ee9066f29e94 Mon Sep 17 00:00:00 2001 From: Carsten Munk Date: Tue, 8 Nov 2011 08:09:25 +0100 Subject: [PATCH] Add functionality to inherit configurations Signed-off-by: Carsten Munk --- kickstart/kickstart.tmpl | 7 +++++-- tools/kickstarter | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index 1ac13be..bf0774e 100644 --- a/kickstart/kickstart.tmpl +++ b/kickstart/kickstart.tmpl @@ -1,6 +1,9 @@ -#if $metadata.has_key("Mic2Options") +#if $metadata.has_key("Mic2Options") and $metadata.has_key("Architecture") +# -*-mic2-options-*- ${metadata.Mic2Options} --arch=${metadata.Architecture} -*-mic2-options-*- +#else if $metadata.has_key("Mic2Options") # -*-mic2-options-*- ${metadata.Mic2Options} -*-mic2-options-*- - +#else if $metadata.has_key("Architecture") +# -*-mic2-options-*- --arch=${metadata.Architecture} -*-mic2-options-*- #end if # ############################################## # Do not Edit! Generated by: diff --git a/tools/kickstarter b/tools/kickstarter index 990b2fe..c4c90b0 100755 --- a/tools/kickstarter +++ b/tools/kickstarter @@ -56,22 +56,25 @@ class KSWriter(): def parse(self, img): conf = copy.copy(image_meta['Default']) - plat = copy.copy(image_meta[img['Platform']]) - conf.update(plat) conf.update(img) lval = ['Repos', 'Groups', 'PostScripts', 'NoChrootScripts', 'RemovePackages', 'ExtraPackages'] lvald = {} + for x in img["Inherit"]: + plat = image_meta[x] + conf.update(plat) for l in lval: full = [] if image_meta['Default'].has_key(l) and image_meta['Default'][l]: - full = full + image_meta['Default'][l] - if plat.has_key(l) and plat[l]: - full = full + plat[l] + full = full + image_meta['Default'][l] + for x in img['Inherit']: + plat = image_meta[x] + if plat.has_key(l) and plat[l]: + full = full + plat[l] if img.has_key(l) and img[l]: full = full + img[l] lvald[l] = sorted(set(full), key=full.index) #print full - conf.update(lvald) + conf.update(lvald) #print conf postscript = "" for scr in conf['PostScripts']: -- 1.7.5.4