From 1478da28aaf495abf2b7b014d341db81b3993649 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 27 Jun 2008 14:38:21 -0400
Subject: Fix kickstart rendering bug

---
 AUTHORS            | 1 +
 CHANGELOG          | 1 +
 cobbler/templar.py | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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:
-- 
cgit