diff options
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/modules/manage_bind.py | 2 | ||||
| -rw-r--r-- | cobbler/modules/manage_isc.py | 3 | ||||
| -rw-r--r-- | cobbler/pxegen.py | 7 | ||||
| -rw-r--r-- | cobbler/settings.py | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/cobbler/modules/manage_bind.py b/cobbler/modules/manage_bind.py index 339fbf0..d88c87c 100644 --- a/cobbler/modules/manage_bind.py +++ b/cobbler/modules/manage_bind.py @@ -49,7 +49,7 @@ def register(): class BindManager: def what(self): - return "isc_and_bind" + return "bind" def __init__(self,config,verbose=False): """ diff --git a/cobbler/modules/manage_isc.py b/cobbler/modules/manage_isc.py index c398270..5e4fbf6 100644 --- a/cobbler/modules/manage_isc.py +++ b/cobbler/modules/manage_isc.py @@ -48,7 +48,7 @@ def register(): class IscManager: def what(self): - return "isc_and_bind" + return "isc" def __init__(self,config,verbose=False): """ @@ -130,7 +130,6 @@ class IscManager: settings_file = self.settings.dhcpd_conf template_file = "/etc/cobbler/dhcp.template" - mode = self.settings.manage_dhcp_mode.lower() try: f2 = open(template_file,"r") diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py index 94bdb2a..048e7ad 100644 --- a/cobbler/pxegen.py +++ b/cobbler/pxegen.py @@ -127,11 +127,14 @@ class PXEGen: f1 = utils.get_config_filename(system,interface=name) + if distro.arch is None or distro.arch == "": + distro.arch = "x86" + # for tftp only ... if distro.arch in [ "i386", "x86", "x86_64", "standard"]: # pxelinux wants a file named $name under pxelinux.cfg f2 = os.path.join(self.bootloc, "pxelinux.cfg", f1) - if distro.arch == "ia64": + elif distro.arch == "ia64": # elilo expects files to be named "$name.conf" in the root # and can not do files based on the MAC address if ip is not None and ip != "": @@ -139,6 +142,8 @@ class PXEGen: filename = "%s.conf" % utils.get_config_filename(system,interface=name) f2 = os.path.join(self.bootloc, filename) + else: + raise CX(_("Invalid arch %s, cobbler is confused") % distro.arch) f3 = os.path.join(self.settings.webdir, "systems", f1) diff --git a/cobbler/settings.py b/cobbler/settings.py index 4670ab0..bd5b0d3 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -58,7 +58,6 @@ DEFAULTS = { "ksdevice" : "eth0" }, "manage_dhcp" : 0, - "manage_dhcp_mode" : "isc", "manage_dns" : 0, "manage_forward_zones" : [], "manage_reverse_zones" : [], @@ -69,6 +68,8 @@ DEFAULTS = { "omshell_bin" : "/usr/bin/omshell", "pxe_just_once" : 0, "register_new_installs" : 0, + "restart_dns" : 1, + "restart_dhcp" : 1, "run_install_triggers" : 1, "server" : "127.0.0.1", "snippetsdir" : "/var/lib/cobbler/snippets", |