Make koan work when no kickstart is set

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8cc85204..2c4dfd4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ wasn't consistant for 0.1.X builds, though it will be in the future.
 - "koan --xen" now takes an optional "--interactive".  By default
   it won't launch an xm console.  For debugging kickstarts, pass
   in the "--interactive" flag (aliased to "-i").
+- koan now works when no kickstart is assigned to the cobbler profile
 
 * Wed Oct 11 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.2-1
 - Bundled subprocess to allow it's use under python 2.3 (RHEL4, etc)
diff --git a/koan/app.py b/koan/app.py
index 58d6de4f..4a36b84a 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -317,6 +317,8 @@ class Koan:
         """
         Get contents of data in network kickstart file.
         """
+        if kickstart is None or kickstart == "":
+            return None
         if kickstart.startswith("nfs"):
             ndir  = os.path.dirname(kickstart[6:])
             nfile = os.path.basename(kickstart[6:])
@@ -376,8 +378,10 @@ class Koan:
         """
 
         # save kickstart to file
+        ksdata = self.get_kickstart_data(kickstart)
         fd = open("/var/spool/koan/ks.cfg","w+")
-        fd.write(self.get_kickstart_data(kickstart))
+        if ksdata is not None:
+            fd.write(ksdata)
         fd.close()
 
         # handle insertion of kickstart based on type of initrd