diff options
| -rw-r--r-- | cobbler/kickgen.py | 4 | ||||
| -rw-r--r-- | cobbler/pxegen.py | 2 | ||||
| -rw-r--r-- | cobbler/remote.py | 2 | ||||
| -rw-r--r-- | config/settings | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/cobbler/kickgen.py b/cobbler/kickgen.py index b0d0a62..1b1cfdd 100644 --- a/cobbler/kickgen.py +++ b/cobbler/kickgen.py @@ -96,8 +96,8 @@ class KickGen: nopxe = "\nwget \"http://%s/cblr/svc/?op=nopxe&system=%s\" -O /dev/null" saveks = "\nwget \"http://%s/cblr/svc/?op=ks&%s=%s\" -O /root/cobbler.ks" - runpost = "\nwget \"http://%s/cblr/svc/?op=trig&?mode=post&%s=%s\" -O /dev/null" - runpre = "\nwget \"http://%s/cblr/svc/?op=trig&?mode=pre&%s=%s\" -O /dev/null" + runpost = "\nwget \"http://%s/cblr/svc/?op=trig&mode=post&%s=%s\" -O /dev/null" + runpre = "\nwget \"http://%s/cblr/svc/?op=trig&mode=pre&%s=%s\" -O /dev/null" what = "profile" blend_this = profile diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py index e39fdc8..a8a9af6 100644 --- a/cobbler/pxegen.py +++ b/cobbler/pxegen.py @@ -286,6 +286,8 @@ class PXEGen: kickstart_path = "http://%s/cblr/svc/?op=ks&system=%s" % (blended["http_server"], system.name) elif kickstart_path.startswith("/") or kickstart_path.find("/cobbler/kickstarts/") != -1: kickstart_path = "http://%s/cblr/svc/?op=ks&profile=%s" % (blended["http_server"], profile.name) + if self.settings.register_new_installs: + kickstart_path = kickstart_path + "®=1" if distro.breed is None or distro.breed == "redhat": append_line = "%s ks=%s" % (append_line, kickstart_path) diff --git a/cobbler/remote.py b/cobbler/remote.py index a87355b..17be852 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -201,7 +201,7 @@ class CobblerXMLRPCInterface: READ: https://fedorahosted.org/cobbler/wiki/AutoRegistration """ - if not self.api.settings().allow_cgi_mac_registration: + if not self.api.settings().register_new_installs: return 1 system = self.api.find_system(mac_address=mac) diff --git a/config/settings b/config/settings index 0a3aaa4..10e06e2 100644 --- a/config/settings +++ b/config/settings @@ -16,7 +16,6 @@ dnsmasq_bin: /usr/sbin/dnsmasq dnsmasq_conf: /etc/dnsmasq.conf httpd_bin: /usr/sbin/httpd http_port: 80 -isc_set_host_name: 0 kerberos_realm: 'example.org' kernel_options: ksdevice: eth0 |