Use the right Script class in anaconda so we have the run method. Fix

setattr on current ks command.  Add "self." in front of "ksdata" in
KickstartParser.  Fix check for chroot option on %post scripts.

1 files changed, 19 insertions, 2 deletions

diff --git a/kickstart.py b/kickstart.py
index d43a80dce..8f5cd2f3c 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -566,8 +566,9 @@ class KickstartPreParser(KickstartParser):
 
     def addScript (self, state, script):
         if state == STATE_PRE:
-            s = Script (script["body"], script["interp"], script["chroot"],
-                        script["log"], script["errorOnFail"])
+            s = AnacondaKSScript (script["body"], script["interp"],
+			          script["chroot"], script["log"],
+				  script["errorOnFail"])
             self.ksdata.preScripts.append(s)
 
     def addPackages (self, line):
@@ -601,6 +602,22 @@ class AnacondaKSParser(KickstartParser):
         self.id = id
         KickstartParser.__init__(self, ksdata, kshandlers)
 
+    def addScript (self, state, script):
+        if script["body"].strip() == "":
+            return
+
+        s = AnacondaKSScript (script["body"], script["interp"],
+                              script["chroot"], script["log"],
+                              script["errorOnFail"])
+        log.info("adding script: %s" % s)
+
+        if state == STATE_PRE:
+            self.ksdata.preScripts.append(s)
+        elif state == STATE_POST:
+            self.ksdata.postScripts.append(s)
+        elif state == STATE_TRACEBACK:
+            self.ksdata.tracebackScripts.append(s)
+
     def handleCommand (self, cmd, args):
         if not self.handler:
             return