diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-11-15 12:14:28 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-11-15 12:14:28 -0800 |
| commit | af6cbbbca4fb9eb043a4951036edf1b300d038ad (patch) | |
| tree | 15f1d2bb0b78d134505277eac3f71e4b73e139b6 | |
| parent | 26a388edc525dd597b8cf267034b64272a40a13c (diff) | |
| download | kickstarter-af6cbbbca4fb9eb043a4951036edf1b300d038ad.tar.gz kickstarter-af6cbbbca4fb9eb043a4951036edf1b300d038ad.tar.bz2 kickstarter-af6cbbbca4fb9eb043a4951036edf1b300d038ad.zip | |
Support custom groups
And use a new path for scripts and partitioning, removed the 'custom'
path.
| -rw-r--r-- | kickstart/kickstart.tmpl | 5 | ||||
| -rw-r--r-- | kswriter/KSWriter.py | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index 2cfb83c..246ac35 100644 --- a/kickstart/kickstart.tmpl +++ b/kickstart/kickstart.tmpl @@ -43,7 +43,12 @@ desktop --autologinuser=${metadata.DefaultUser} #slurp #end if #end if +#if $metadata.has_key("UserGroups") +user --name ${metadata.DefaultUser} --groups ${metadata.UserGroups} --password '${metadata.DefaultUserPass}' +#else user --name ${metadata.DefaultUser} --groups audio,video --password '${metadata.DefaultUserPass}' +#end if + #set $options_global = "" #if $metadata.SaveRepos diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py index c22f20d..20c78cd 100644 --- a/kswriter/KSWriter.py +++ b/kswriter/KSWriter.py @@ -68,28 +68,28 @@ class KSWriter(): postscript = "" meta_root = os.path.dirname(self.image_filename) for scr in conf['PostScripts']: - if os.path.exists('%s/custom/scripts/%s.post' %(meta_root, scr)): - f = open('%s/custom/scripts/%s.post' %(meta_root, scr), 'r') + if os.path.exists('%s/scripts/%s.post' %(meta_root, scr)): + f = open('%s/scripts/%s.post' %(meta_root, scr), 'r') postscript += f.read() postscript += "\n" f.close() else: - print '%s/custom/scripts/%s.post not found, skipping.' %(meta_root,scr ) + print '%s/scripts/%s.post not found, skipping.' %(meta_root,scr ) nochrootscript = "" for scr in conf['NoChrootScripts']: - if os.path.exists('%s/custom/scripts/%s.nochroot' %(meta_root,scr)): - f = open('%s/custom/scripts/%s.nochroot' %(meta_root, scr ), 'r') + if os.path.exists('%s/scripts/%s.nochroot' %(meta_root,scr)): + f = open('%s/scripts/%s.nochroot' %(meta_root, scr ), 'r') nochrootscript += f.read() nochrootscript += "\n" f.close() else: - print '%s/custom/scripts/%s.nochroot not found, skipping.' %(meta_root, scr ) + print '%s/scripts/%s.nochroot not found, skipping.' %(meta_root, scr ) ptab = "" for g in [ plat, img ]: if g.has_key("Part"): - f = open("%s/custom/part/%s" %(meta_root, g['Part']) ) + f = open("%s/partitions/%s" %(meta_root, g['Part']) ) ptab = f.read() f.close() |