summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-27 14:38:21 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-27 14:38:21 -0400
commit1478da28aaf495abf2b7b014d341db81b3993649 (patch)
tree9d0901144c9d6151f5a2f7c8c860e44ca88be24c
parent8a6815593ba30b1bd7f68f6ee393436088c43012 (diff)
downloadthird_party-cobbler-1478da28aaf495abf2b7b014d341db81b3993649.tar.gz
third_party-cobbler-1478da28aaf495abf2b7b014d341db81b3993649.tar.xz
third_party-cobbler-1478da28aaf495abf2b7b014d341db81b3993649.zip
Fix kickstart rendering bug
-rw-r--r--AUTHORS1
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/templar.py2
3 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index be24db3..198020b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ Patches and other contributions from:
Vito Laurenza <vitolaurenza@gmail.com>
Adrian Likins <alikins@redhat.com>
David Lutterkort <dlutter@redhat.com>
+ Bryan Mason' <bjmason@redhat.com>
Lester M. <needwork@gmail.com>
Sean Millichamp <sean@bruenor.org>
Jim Meyering <jim@meyering.net>
diff --git a/CHANGELOG b/CHANGELOG
index 8365bea..d594dd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ Cobbler CHANGELOG
- add new settings to control whether the restart-trigger restarts things
- yum reposync should also pull i686 kernels, not just i386
- make cobblerd close file handles
+- fix kickstart serving when the tree is on NFS
- Mon Jun 09 2008 - 1.0.2
- Fix mkdir invocation
diff --git a/cobbler/templar.py b/cobbler/templar.py
index edfd5f2..afd9715 100644
--- a/cobbler/templar.py
+++ b/cobbler/templar.py
@@ -64,7 +64,7 @@ class Templar:
# directive instead. Do this to make the templates work.
newdata = ""
if search_table.has_key("tree") and search_table["tree"].startswith("nfs://"):
- for line in data.split("\n"):
+ for line in raw_data.split("\n"):
if line.find("--url") != -1 and line.find("url ") != -1:
rest = search_table["tree"][6:] # strip off "nfs://" part
try: