File build_iso.diff of Package cobbler

--- cobbler/action_buildiso.py
+++ cobbler/action_buildiso.py	2010/08/11 15:19:53
@@ -166,7 +166,10 @@
                     )
 
                 append_line = "  append initrd=%s.img" % distname
-                append_line = append_line + " ks=%s " % data["kickstart"]
+                if dist.breed == "suse":
+                    append_line = append_line + " autoyast=%s " % data["kickstart"]
+                else:
+                    append_line = append_line + " ks=%s " % data["kickstart"]
                 append_line = append_line + " %s\n" % data["kernel_options"]
 
                 length=len(append_line)
@@ -407,6 +410,8 @@
             isolinuxbin = "/usr/lib/syslinux/isolinux.bin"
 
         menu = "/var/lib/cobbler/loaders/menu.c32"
+        if not os.path.exists(menu):
+             menu = "/usr/share/syslinux/menu.c32"
 
         chain = "/usr/share/syslinux/chain.c32"
         if not os.path.exists(chain):
--- cobbler/remote.py
+++ cobbler/remote.py	2010/08/11 15:18:45
@@ -94,7 +94,7 @@
         try:
             rc = self._run(self)
             self.remote._set_task_state(self,self.event_id,EVENT_COMPLETE)
-            self.on_done()
+            self.on_done
             return rc
         except:
             utils.log_exc(self.logger)
openSUSE Build Service is sponsored by