diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-02-09 09:46:55 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-09 09:46:55 -0500 |
| commit | 17fcca0a828073d82f9eddd4366d921d773838e1 (patch) | |
| tree | 449c27b9c04b3f283bb12410ec3196c957cf8aca /cobbler/action_sync.py | |
| parent | ce9a7eb431c43da5710d3e589eec1bd4a9dfd34d (diff) | |
| parent | 4fcfce9f722961c6b20ee6cec3eb196f618b7a2e (diff) | |
| download | third_party-cobbler-17fcca0a828073d82f9eddd4366d921d773838e1.tar.gz third_party-cobbler-17fcca0a828073d82f9eddd4366d921d773838e1.tar.xz third_party-cobbler-17fcca0a828073d82f9eddd4366d921d773838e1.zip | |
merge with myself
Diffstat (limited to 'cobbler/action_sync.py')
| -rw-r--r-- | cobbler/action_sync.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 6a4e51a..1a41d30 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -352,7 +352,7 @@ class BootSync: ) self.mkdir(copy_path) dest = os.path.join(copy_path, "ks.cfg") - print "ks copy: %s -> %s" % (kickstart_path, dest) + # print "ks copy: %s -> %s" % (kickstart_path, dest) try: meta = self.blend_options(False, ( distro.ks_meta, @@ -603,7 +603,10 @@ class BootSync: if kickstart_path.startswith("/") or kickstart_path.find("/cobbler/kickstarts/") != -1: pxe_fn = self.get_pxe_filename(system.name) kickstart_path = "http://%s/cobbler_track/kickstarts_sys/%s/ks.cfg" % (self.settings.server, pxe_fn) - append_line = "%s ks=%s" % (append_line, kickstart_path) + if distro.breed is None or distro.breed == "redhat": + append_line = "%s ks=%s" % (append_line, kickstart_path) + elif distro.breed == "suse": + append_line = "%s autoyast=%s" % (append_line, kickstart_path) # now to add the append line to the file if not is_ia64: |