File fixes-distro-none-case.diff of Package cobbler.22866

Overview Repositories Revisions Requests Users Attributes Meta

File fixes-distro-none-case.diff of Package cobbler.22866

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
@@ -166,7 +166,7 @@ class BuildIso:
 
              data = utils.blender(self.api, False, profile)
              # SUSE is not using 'text'. Instead 'textmode' is used as kernel option.
-             utils.suse_kopts_textmode_overwrite(dist.breed, data['kernel_options'])
+             utils.suse_kopts_textmode_overwrite(dist, data['kernel_options'])
 
              if data["kickstart"].startswith("/"):
                  data["kickstart"] = "http://%s:%s/cblr/svc/op/ks/profile/%s" % (
@@ -475,7 +475,7 @@ class BuildIso:
         for descendant in descendants:
             data = utils.blender(self.api, False, descendant)
             # SUSE is not using 'text'. Instead 'textmode' is used as kernel option.
-            utils.suse_kopts_textmode_overwrite(distro.breed, data['kernel_options'])
+            utils.suse_kopts_textmode_overwrite(distro, data['kernel_options'])
 
             cfg.write("\n")
             cfg.write("LABEL %s\n" % descendant.name)
Index: cobbler-2.6.6/cobbler/pxegen.py
===================================================================
--- cobbler-2.6.6.orig/cobbler/pxegen.py
+++ cobbler-2.6.6/cobbler/pxegen.py
@@ -869,7 +869,7 @@ class PXEGen:
         kopts = blended.get("kernel_options", dict())
 
         # SUSE is not using 'text'. Instead 'textmode' is used as kernel option
-        utils.suse_kopts_textmode_overwrite(distro.breed, kopts)
+        utils.suse_kopts_textmode_overwrite(distro, kopts)
 
         # support additional initrd= entries in kernel options.
         if "initrd" in kopts:
Index: cobbler-2.6.6/cobbler/utils.py
===================================================================
--- cobbler-2.6.6.orig/cobbler/utils.py
+++ cobbler-2.6.6/cobbler/utils.py
@@ -2322,9 +2322,9 @@ def find_distro_path(settings, distro):
     # directory in which the given distro's kernel is
     return os.path.dirname(distro.kernel)
 
-def suse_kopts_textmode_overwrite(distro_breed, kopts):
+def suse_kopts_textmode_overwrite(distro, kopts):
     """SUSE is not using 'text'. Instead 'textmode' is used as kernel option."""
-    if distro_breed == "suse":
+    if distro and distro.breed == "suse":
         if 'textmode' in kopts.keys():
             kopts.pop('text', None)
         elif 'text' in kopts.keys():

Places

File fixes-distro-none-case.diff of Package cobbler.22866

Places