summaryrefslogtreecommitdiffstats
path: root/cobbler/utils.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-11-01 18:03:25 -0400
committerMichael DeHaan <mdehaan@redhat.com>2007-11-01 18:03:25 -0400
commit7075e26adcb4f185931930c2b9489502501e12ee (patch)
tree8edee6e1e788fc083cd485716c053282146d4d05 /cobbler/utils.py
parent95e5a65993da2d0b008222501c6a132bb8a3daa2 (diff)
downloadthird_party-cobbler-7075e26adcb4f185931930c2b9489502501e12ee.tar.gz
third_party-cobbler-7075e26adcb4f185931930c2b9489502501e12ee.tar.xz
third_party-cobbler-7075e26adcb4f185931930c2b9489502501e12ee.zip
Code to wire up the new --server-override to the sync code. This leaves off some of the
repo management, which will not work with --server-override completely in all cases (depending on DNS) until we do some extra post magic in our action_sync stanza generaton. Ow, my brain hurts just thinking about other people who have to read that explanation :)
Diffstat (limited to 'cobbler/utils.py')
-rw-r--r--cobbler/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py
index 113d9dd..4f63651 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -288,7 +288,7 @@ def blender(api_handle,remove_hashes, root_obj):
if settings.syslog_port != 0:
if not results.has_key("kernel_options"):
results["kernel_options"] = {}
- syslog = "%s:%s" % (settings.server, settings.syslog_port)
+ syslog = "%s:%s" % (results["server"], settings.syslog_port)
results["kernel_options"]["syslog"] = syslog
# determine if we have room to add kssendmac to the kernel options line