diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-06-12 17:15:11 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-06-12 17:15:11 -0400 |
| commit | d92ed20f0cd6ae40cca561c3ed7c34561693827b (patch) | |
| tree | b158f933ba0e6c5d6c5cf0c68bf71f023acd0af8 /cobbler | |
| parent | 97d4406be919c5ac53e9d2dc2a5dc6e323bc19c4 (diff) | |
| download | cobbler-d92ed20f0cd6ae40cca561c3ed7c34561693827b.tar.gz cobbler-d92ed20f0cd6ae40cca561c3ed7c34561693827b.tar.xz cobbler-d92ed20f0cd6ae40cca561c3ed7c34561693827b.zip | |
Make ksmeta variables available at top level again.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_sync.py | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index d1f5f6ad..17ec03b8 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -332,11 +332,10 @@ class BootSync: self.mkdir(copy_path) dest = os.path.join(copy_path, "ks.cfg") try: - # will_it_blend = (distro.ks_meta, g.ks_meta) - # regular blend - # meta = self.blend_options(False, will_it_blend) meta = utils.blender(False, g) - + ksmeta = meta["ks_meta"] + del meta["ks_meta"] + meta.update(ksmeta) # make available at top level meta["yum_repo_stanza"] = self.generate_repo_stanza(g) meta["yum_config_stanza"] = self.generate_config_stanza(g) meta["kickstart_done"] = self.generate_kickstart_signal(g, is_system=False) @@ -435,13 +434,10 @@ class BootSync: self.mkdir(copy_path) dest = os.path.join(copy_path, "ks.cfg") try: - # regular blend - #meta = self.blend_options(False,( - # distro.ks_meta, - # profile.ks_meta, - # s.ks_meta - #)) meta = utils.blender(False, s) + ksmeta = meta["ks_meta"] + del meta["ks_meta"] + meta.update(ksmeta) # make available at top level meta["yum_repo_stanza"] = self.generate_repo_stanza(profile) meta["yum_config_stanza"] = self.generate_config_stanza(profile) meta["kickstart_done"] = self.generate_kickstart_signal(profile, is_system=True) @@ -612,24 +608,10 @@ class BootSync: # now build the kernel command line if system is not None: - # kernel blend - #kopts = self.blend_options(True,( - # self.settings.kernel_options, - # profile.kernel_options, - # distro.kernel_options, - # system.kernel_options - #)) kopts = utils.blender(True,system)["kernel_options"] else: - # kernel blend - #kopts = self.blend_options(True,( - # self.settings.kernel_options, - # profile.kernel_options, - # distro.kernel_options - #)) kopts = utils.blender(True,profile)["kernel_options"] - # --- # generate the append line append_line = "append %s" % utils.hash_to_string(kopts) |