diff options
author | root <root@drwily.rdu.redhat.com> | 2007-09-04 16:53:00 -0400 |
---|---|---|
committer | root <root@drwily.rdu.redhat.com> | 2007-09-04 16:53:00 -0400 |
commit | 983bfff46c01178371b4374f62b8588d7ff094ce (patch) | |
tree | 147d4c534e0a2c3361c43db370449b5742569905 /cobbler | |
parent | ffd5a126218933971fea3521bbb10056983aad5c (diff) | |
download | third_party-cobbler-983bfff46c01178371b4374f62b8588d7ff094ce.tar.gz third_party-cobbler-983bfff46c01178371b4374f62b8588d7ff094ce.tar.xz third_party-cobbler-983bfff46c01178371b4374f62b8588d7ff094ce.zip |
Make cobbler not fetch the kickstart when it may be external and CGI based.
Diffstat (limited to 'cobbler')
-rw-r--r-- | cobbler/action_sync.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index bfe41bb..3eee849 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -366,17 +366,26 @@ class BootSync: pattern2 = "wget http://%s/cgi-bin/nopxe.cgi?system=%s -b" pattern3 = "wget http://%s/cobbler/%s/%s/ks.cfg -O /root/cobbler.ks" + blend_this = profile + if system: + blend_this = system + + blended = utils.blender(False, blend_this) + kickstart = blended.get("kickstart",None) + buf = "" if system is not None: buf = buf + pattern1 % (self.settings.server, "system", "done", system.name) if str(self.settings.pxe_just_once).upper() in [ "1", "Y", "YES", "TRUE" ]: buf = buf + "\n" + pattern2 % (self.settings.server, system.name) - buf = buf + "\n" + pattern3 % (self.settings.server, "kickstarts_sys", system.name) + if kickstart and os.path.exists(kickstart): + buf = buf + "\n" + pattern3 % (self.settings.server, "kickstarts_sys", system.name) else: buf = buf + pattern1 % (self.settings.server, "profile", "done", profile.name) - buf = buf + "\n" + pattern3 % (self.settings.server, "kickstarts", profile.name) - + if kickstart and os.path.exists(kickstart): + buf = buf + "\n" + pattern3 % (self.settings.server, "kickstarts", profile.name) + return buf def generate_repo_stanza(self, profile): |