From 6a4815d9995a48e1c7f94dae86c0bacdd33a4b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rgen=20Maas?= Date: Wed, 18 Apr 2012 17:29:34 +0200 Subject: [PATCH 1/2] Buildiso: allow override of autoyast keyword for SuSE systems. Add kickstart through proxy support for RedHat based systems. Tested with, see: https://github.com/cobbler/cobbler/wiki/2.2.3 --- cobbler/action_buildiso.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/cobbler/action_buildiso.py b/cobbler/action_buildiso.py index 6dc18a765e..478de1a6ec 100644 --- a/cobbler/action_buildiso.py +++ b/cobbler/action_buildiso.py @@ -171,9 +171,17 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e append_line += " install=http://%s:%s/cblr/links/%s" % ( data["server"], self.api.settings().http_port, dist.name ) - append_line += " autoyast=%s" % data["kickstart"] + if data["kernel_options"].has_key("autoyast") and data["kernel_options"]["autoyast"] != "": + append_line += " autoyast=%s" % data["kernel_options"]["autoyast"] + del data["kernel_options"]["autoyast"] + else: + append_line += " autoyast=%s" % data["kickstart"] + if dist.breed == "redhat": + if data["proxy"] != "": + append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"]) append_line += " ks=%s" % data["kickstart"] + if dist.breed in ["ubuntu","debian"]: append_line += " auto-install/enable=true url=%s" % data["kickstart"] if data["proxy"] != "": @@ -215,10 +223,20 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e append_line += " install=%s" % data["kernel_options"]["install"] del data["kernel_options"]["install"] else: - append_line += " install=http://%s:%s/cblr/links/%s" % (data["server"], self.api.settings().http_port, dist.name) - append_line += " autoyast=%s" % data["kickstart"] + append_line += " install=http://%s:%s/cblr/links/%s" % ( + data["server"], self.api.settings().http_port, dist.name + ) + if data["kernel_options"].has_key("autoyast") and data["kernel_options"]["autoyast"] != "": + append_line += " autoyast=%s" % data["kernel_options"]["autoyast"] + del data["kernel_options"]["autoyast"] + else: + append_line += " autoyast=%s" % data["kickstart"] + if dist.breed == "redhat": + if data["proxy"] != "": + append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"]) append_line += " ks=%s" % data["kickstart"] + if dist.breed in ["ubuntu","debian"]: append_line += " auto-install/enable=true url=%s netcfg/disable_dhcp=true" % data["kickstart"] if data["proxy"] != "": From 18c09dfa49b03b3fef873c8b99adfb325b436c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rgen=20Maas?= Date: Wed, 18 Apr 2012 18:14:59 +0200 Subject: [PATCH 2/2] Bugfix in buildiso for RedHat based systems. The interface->ip resolution was broken when ksdevice=bootif (default) --- cobbler/action_buildiso.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cobbler/action_buildiso.py b/cobbler/action_buildiso.py index 478de1a6ec..f27c0698b3 100644 --- a/cobbler/action_buildiso.py +++ b/cobbler/action_buildiso.py @@ -275,6 +275,8 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e if dist.breed == "redhat": if data["kernel_options"].has_key("ksdevice") and data["kernel_options"]["ksdevice"] != "": my_int = data["kernel_options"]["ksdevice"] + if my_int == "bootif": + my_int = None del data["kernel_options"]["ksdevice"] if data["kernel_options"].has_key("ip") and data["kernel_options"]["ip"] != "": my_ip = data["kernel_options"]["ip"]