Added possibility to set repository specific options (BMC#15938)

diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 83bd1d3..6ac2d09 100644 (file)
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -35,17 +35,21 @@ desktop --autologinuser=${metadata.DefaultUser}  #slurp
 #end if
 user --name ${metadata.DefaultUser}  --groups audio,video --password ${metadata.DefaultUserPass} 
 
-#set $save = ""
+#set $options_global = ""
 #if $metadata.SaveRepos
-#set $save = "--save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego"
+#set $options_global = "--save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego"
 #end if
 #for $r in $metadata.Repos
 #for $rr in $repos
 #if $rr.Name == $r
+#set $options_repo = $options_global
+#if $rr.has_key("Options")
+#set $options_repo = $rr.Options
+#end if
 #if $rr.Name == "adobe"
 repo --name=${r} --baseurl=${rr.Url} --save
 #else
-repo --name=${r} --baseurl=${rr.Url} ${save}
+repo --name=${r} --baseurl=${rr.Url} ${options_repo}
 #end if
 #end if
 #end for

diff --git a/tools/kickstarter b/tools/kickstarter
index 5b483cb..da49735 100755 (executable)
--- a/tools/kickstarter
+++ b/tools/kickstarter
@@ -108,6 +108,8 @@ class KSWriter():
             for repo in repos:
                 r = {}
                 r['Name'] = repo['Name']
+                if repo.has_key('Options'):
+                    r['Options'] = repo['Options']
                 r['Url'] = repo['Url'].replace("@ARCH@", meta['Architecture'])
                 r['Url'] = r['Url'].replace("@RELEASE@", meta['Baseline'])
                 new_repos.append(r)