File fix-textmode-for-SUSE.dif of Package cobbler

Overview Repositories Revisions Requests Users Attributes Meta

File fix-textmode-for-SUSE.dif of Package cobbler (Revision 100453275442eb8db910c3130d48dd68)

Currently displaying revision 100453275442eb8db910c3130d48dd68 , Show latest

Index: cobbler-2.6.6/cobbler/action_buildiso.py
===================================================================
--- cobbler-2.6.6.orig/cobbler/action_buildiso.py
+++ cobbler-2.6.6/cobbler/action_buildiso.py
@@ -191,6 +191,8 @@ class BuildIso:
                  if data.has_key("proxy") and data["proxy"] != "":
                      append_line += " mirror/http/proxy=%s" % data["proxy"]
              append_line += self.add_remaining_kopts(data["kernel_options"])
+             if dist.breed == "suse":
+                 append_line = append_line.replace("text","textmode=1")
              cfg.write(append_line)
 
        cfg.write("\nMENU SEPARATOR\n")
@@ -398,7 +400,7 @@ class BuildIso:
                      append_line += " netcfg/get_gateway=%s" % my_gw
 
              if exclude_dns is None or my_dns is not None:
-                if dist.breed == "suse":
+                if dist.breed == "suse" and type(my_dns) == list and len(my_dns) >= 1:
                    append_line += " nameserver=%s" % my_dns[0]
                 if dist.breed == "redhat":
                    if type(my_dns) == list:
@@ -410,6 +412,8 @@ class BuildIso:
 
              # add remaining kernel_options to append_line
              append_line += self.add_remaining_kopts(data["kernel_options"])
+             if dist.breed == "suse":
+                append_line = append_line.replace("text","textmode=1")
              cfg.write(append_line)
 
        cfg.write("\n")
@@ -478,6 +482,8 @@ class BuildIso:
 
             # add remaining kernel_options to append_line
             append_line += self.add_remaining_kopts(data["kernel_options"])
+            if dist.breed == "suse":
+                append_line = append_line.replace("text","textmode=1")
             cfg.write(append_line)
 
             if descendant.COLLECTION_TYPE == 'profile':
Index: cobbler-2.6.6/cobbler/pxegen.py
===================================================================
--- cobbler-2.6.6.orig/cobbler/pxegen.py
+++ cobbler-2.6.6/cobbler/pxegen.py
@@ -827,6 +827,9 @@ class PXEGen:
                     append_line = append_line.replace('ksdevice=bootif','ksdevice=${net0/mac}')
             elif distro.breed == "suse":
                 append_line = "%s autoyast=%s" % (append_line, kickstart_path)
+
+                # rework kernel options for suse distro
+                append_line = append_line.replace("text","textmode=1")
             elif distro.breed == "debian" or distro.breed == "ubuntu":
                 append_line = "%s auto-install/enable=true priority=critical url=%s" % (append_line, kickstart_path)
                 if management_interface:

Places

File fix-textmode-for-SUSE.dif of Package cobbler (Revision 100453275442eb8db910c3130d48dd68)

Places