summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-03-12 15:33:35 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-03-12 15:33:35 -0400
commit73857cbd67b62fda81398ba95c81df3abb59f1b1 (patch)
tree8dfa9891ac0024757258e15597347b6508d168cc
parentcb518895c64bfb690a1f3df0aaeeb147209493c3 (diff)
downloadthird_party-cobbler-73857cbd67b62fda81398ba95c81df3abb59f1b1.tar.gz
third_party-cobbler-73857cbd67b62fda81398ba95c81df3abb59f1b1.tar.xz
third_party-cobbler-73857cbd67b62fda81398ba95c81df3abb59f1b1.zip
Adding patch to send hostname
-rw-r--r--AUTHORS1
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/action_sync.py2
-rw-r--r--cobbler/settings.py1
4 files changed, 5 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9a0fe8b..bcb8137 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ Patches and other contributions from:
Máirín Duffy <duffy@redhat.com>
Tru Huynh <tru@pasteur.fr>
Matt Hyclak <hyclak@math.ohiou.edu>
+ Pablo Iranzo Gómez <pablo.gomez@redhat.com>
Mihai Ibanescu <mihai.ibanescu@gmail.com>
Vito Laurenza <vitolaurenza@gmail.com>
Adrian Likins <alikins@redhat.com>
diff --git a/CHANGELOG b/CHANGELOG
index 4b1a203..db1303e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Cobbler CHANGELOG
- Mon Mar 10 2008 - 0.9.0
- Make createrepo get run for local cobbler reposync invocations as needed
- patch to allow yumopts to override gpgcheck
+- applied patch to send hostname from ISC
- ??? - 0.8.3
- fix WebUI documentation URL
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 139066e..d6ea178 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -163,6 +163,8 @@ class BootSync:
# the label the entry after the hostname if possible
if host is not None and host != "":
systxt = "\nhost %s {\n" % host
+ if self.settings.isc_set_host_name:
+ systxt = systxt + " option host-name = %s;\n" % host
else:
systxt = "\nhost generic%d {\n" % counter
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 581403c..e89f254 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -39,6 +39,7 @@ DEFAULTS = {
"dnsmasq_conf" : "/etc/dnsmasq.conf",
"httpd_bin" : "/usr/sbin/httpd",
"http_port" : "80",
+ "isc_set_host_name" : 0,
"kerberos_realm" : "example.org",
"kernel_options" : {
"lang" : " ",