diff options
| author | David Lutterkort <dlutter@redhat.com> | 2006-10-26 16:21:34 -0700 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-26 16:21:34 -0700 |
| commit | 8469d8fc637e890c7d0fce2a472058f3721eef3d (patch) | |
| tree | 01c0e424d524e6690eb2ec967747b4c13913149a | |
| parent | 1ba62867b46323e6b53b5233be300b4faae2458d (diff) | |
| download | third_party-cobbler-8469d8fc637e890c7d0fce2a472058f3721eef3d.tar.gz third_party-cobbler-8469d8fc637e890c7d0fce2a472058f3721eef3d.tar.xz third_party-cobbler-8469d8fc637e890c7d0fce2a472058f3721eef3d.zip | |
Merge 247:06e34f3b1f36
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 4 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -8,6 +8,7 @@ Cobbler CHANGELOG older releases (for now). The CLI still takes the --xen options as well as the new --virt options, as they are aliased. The API now exclusively just uses methods with "virt" in them, however. +- Fixed some bugs related to kickstart templating * Tue Oct 24 2006 - 0.3.0-1 - Reload httpd during sync diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 725bf7d..fb7697a 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -468,8 +468,8 @@ class BootSync: # kickstart path (if kickstart is used) if kickstart_path is not None and kickstart_path != "": # if kickstart path is on disk, we've already copied it into - # the HTTP mirror, so make it something anaconda can get at - if kickstart_path.startswith("/"): + # the HTTP mirror, so make it something anaconda can get at. + if kickstart_path.startswith("/") or kickstart_path.find("/cobbler/kickstarts/") != -1: pxe_fn = self.get_pxe_filename(system.name) kickstart_path = "http://%s/cobbler/kickstarts_sys/%s/ks.cfg" % (self.settings.server, pxe_fn) append_line = "%s ks=%s" % (append_line, kickstart_path) diff --git a/cobbler/settings.py b/cobbler/settings.py index 276e1ed..4b2c4df 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -24,7 +24,7 @@ DEFAULTS = { "server" : "127.0.0.1", "next_server" : "127.0.0.1", "dhcpd_bin" : "/usr/sbin/dhcpd", - "kernel_options" : "append devfs=nomount ramdisk_size=16438 lang= vga=788 ksdevice=eth0", + "kernel_options" : "append devfs=nomount ramdisk_size=16438 lang= text ksdevice=eth0", "tftpd_conf" : "/etc/xinetd.d/tftp", "tftpboot" : "/tftpboot", "webdir" : "/var/www/cobbler", |