diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-10-12 15:56:52 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2007-10-12 15:56:52 -0400 |
| commit | b52d634208b19a4946416a2e532df6f8e63f4879 (patch) | |
| tree | 6b53c62145a98c958a6c334b8c8c6ae84cd44e5c | |
| parent | 427514b86d143d0c12766a9a6fb683a69d997e29 (diff) | |
| download | third_party-cobbler-b52d634208b19a4946416a2e532df6f8e63f4879.tar.gz third_party-cobbler-b52d634208b19a4946416a2e532df6f8e63f4879.tar.xz third_party-cobbler-b52d634208b19a4946416a2e532df6f8e63f4879.zip | |
Applied Jack's patch to keep kickstart values from being resolved as <<inherit>>.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -16,6 +16,7 @@ Patches and other contributions from: David Lutterkort <dlutter@redhat.com> Jim Meyering <jim@meyering.net> Perry Myers <pmyers@redhat.com> + Jack Neely <jjneely@ncsu.edu> Ben Riggs <rigg0022@umn.edu> Adam Rosenwald <thestrider@gmail.com> Scott Seago <sseago@redhat.com> diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 5d3cd10..3de38a8 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -715,7 +715,9 @@ class BootSync: # find kernel and initrd kernel_path = os.path.join("/images",distro.name,os.path.basename(distro.kernel)) initrd_path = os.path.join("/images",distro.name,os.path.basename(distro.initrd)) - kickstart_path = profile.kickstart + + # Find the kickstart if we inherit from another profile + kickstart_path = utils.blender(True, profile)["kickstart"] # --- # choose a template |