Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
cobbler.10898
fixes-distro-none-case.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fixes-distro-none-case.diff of Package cobbler.10898
diff --git a/cobbler/action_buildiso.py b/cobbler/action_buildiso.py index 41048b3e4..1c9a0a1b4 100644 --- a/cobbler/action_buildiso.py +++ b/cobbler/action_buildiso.py @@ -156,7 +156,7 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e 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" % ( @@ -460,7 +460,7 @@ def generate_standalone_iso(self,imagesdir,isolinuxdir,distname,filesource): 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) diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py index 84453c91e..47c83bf27 100644 --- a/cobbler/pxegen.py +++ b/cobbler/pxegen.py @@ -784,7 +784,7 @@ def build_kernel_options(self, system, profile, distro, image, arch, 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: diff --git a/cobbler/utils.py b/cobbler/utils.py index b58ae1b69..dfb94e6aa 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -2304,9 +2304,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():
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor