add a new keyword 'FileSystem', based on the updated static '.ks' file

furthormore, just one '\n' there enough

diff --git a/configurations.yaml b/configurations.yaml
index 13bb538..1534bed 100644 (file)
--- a/configurations.yaml
+++ b/configurations.yaml
@@ -9,6 +9,7 @@ Default:
     DefaultUser: meego
     DefaultUserPass: meego
     PartSize: 1900
+    FileSystem: ext3
     PostScripts:
         - rpm
     Groups:

diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index bbc421a..83bd1d3 100644 (file)
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -11,7 +11,7 @@ lang ${metadata.Language}
 keyboard ${metadata.Keyboard}
 timezone --utc ${metadata.Timezone}
 #if $metadata.Part == ""
-part / --size ${metadata.PartSize} --ondisk sda --fstype=ext3
+part / --size ${metadata.PartSize} --ondisk sda --fstype=${metadata.FileSystem}
 #else
 ${metadata.Part}
 #end if

diff --git a/tools/kickstarter b/tools/kickstarter
index 9b3cdbe..2d511f2 100755 (executable)
--- a/tools/kickstarter
+++ b/tools/kickstarter
@@ -62,14 +62,14 @@ class KSWriter():
         for scr in conf['PostScripts']:
             f = open('./custom/scripts/%s.post' %scr, 'r')
             postscript += f.read()
-            postscript += "\n\n"
+            postscript += "\n"
             f.close()
 
         nochrootscript = ""              
         for scr in conf['NoChrootScripts']:
             f = open('./custom/scripts/%s.nochroot' %scr, 'r')
             nochrootscript += f.read()
-            nochrootscript += "\n\n"
+            nochrootscript += "\n"
             f.close()
 
         ptab = ""