diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-10-31 12:50:33 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2007-10-31 12:50:33 -0400 |
| commit | 8c179cbc21dcafd91671404607f1c290f18aeb11 (patch) | |
| tree | 74aa55b7b4a7805fb9b6cbc7615a0c7e5cddf46c /cobbler/action_sync.py | |
| parent | 4f6d730917ea7b3e1669fa72ca3fb36118a3f106 (diff) | |
| download | third_party-cobbler-8c179cbc21dcafd91671404607f1c290f18aeb11.tar.gz third_party-cobbler-8c179cbc21dcafd91671404607f1c290f18aeb11.tar.xz third_party-cobbler-8c179cbc21dcafd91671404607f1c290f18aeb11.zip | |
Fix for cobbler's dhcp generation behavior with the new interface representation.
(Plus some unfinished work on paginating the WebUI).
Diffstat (limited to 'cobbler/action_sync.py')
| -rw-r--r-- | cobbler/action_sync.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 7efa0b5..4d07881 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -166,7 +166,7 @@ class BootSync: if distro.arch == "ia64": # can't use pxelinux.0 anymore systxt = systxt + " filename \"/%s\";\n" % elilo - systxt = systxt + " hardware ethernet %s;\n" % mac + systxt = systxt + " hardware ethernet %s;\n" % mac if ip is not None and ip != "": systxt = systxt + " fixed-address %s;\n" % ip # not needed, as it's in the template. @@ -187,9 +187,13 @@ class BootSync: else: systxt = "" - if not system_definitions.has_key(interface["dhcp_tag"]): - system_definitions[interface["dhcp_tag"]] = "" - system_definitions[interface["dhcp_tag"]] = system_definitions[interface["dhcp_tag"]] + systxt + dhcp_tag = interface["dhcp_tag"] + if dhcp_tag == "": + dhcp_tag = "default" + + if not system_definitions.has_key(dhcp_tag): + system_definitions[dhcp_tag] = "" + system_definitions[dhcp_tag] = system_definitions[dhcp_tag] + systxt # we are now done with the looping through each interface of each system |