allow parameters in xml profile for autoyast scripts (fate#312687)

yast · Oct 14, 2013 · f0de3a6 · f0de3a6
1 parent c15139a
commit f0de3a6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/src/autoyast-rnc/scripts.rnc b/src/autoyast-rnc/scripts.rnc
@@ -75,9 +75,15 @@ autoinstall-chroot-script = element script {
   debug? &
   feedback? &
   feedback_type? &
+  param-list? &
   element notification { text }?
 }
 
+param-list = element param-list {
+  LIST,
+  element param { text }*
+  }
+
 chrooted = element chrooted { BOOLEAN }
 debug = element debug { BOOLEAN }
 feedback = element feedback { BOOLEAN }

diff --git a/src/include/autoinstall/xml.rb b/src/include/autoinstall/xml.rb
@@ -97,7 +97,8 @@ def profileSetup
           "proposals"                => "proposal",
           "net-udev"                 => "rule",
           "ask-list"                 => "ask",
-          "device_order"             => "device"
+          "device_order"             => "device",
+          "param-list"               => "param"
         }
       )
 

diff --git a/src/modules/AutoinstScripts.rb b/src/modules/AutoinstScripts.rb
@@ -150,6 +150,7 @@ def Export
           "location"      => Ops.get_string(p, "location", ""),
           "feedback"      => Ops.get_boolean(p, "feedback", false),
           "feedback_type" => Ops.get_string(p, "feedback_type", ""),
+	  "param-list"    => p.fetch("param-list",[]),
           "debug"         => Ops.get_boolean(p, "debug", true)
         }
       end
@@ -163,6 +164,7 @@ def Export
           "feedback"       => Ops.get_boolean(p, "feedback", false),
           "feedback_type"  => Ops.get_string(p, "feedback_type", ""),
           "debug"          => Ops.get_boolean(p, "debug", true),
+	  "param-list"    => p.fetch("param-list",[]),
           "network_needed" => Ops.get_boolean(p, "network_needed", false)
         }
       end
@@ -176,6 +178,7 @@ def Export
           "location"      => Ops.get_string(p, "location", ""),
           "feedback"      => Ops.get_boolean(p, "feedback", false),
           "feedback_type" => Ops.get_string(p, "feedback_type", ""),
+	  "param-list"    => p.fetch("param-list",[]),
           "debug"         => Ops.get_boolean(p, "debug", true)
         }
       end
@@ -196,6 +199,7 @@ def Export
           "notification"  => Ops.get_string(p, "notification", ""),
           "feedback"      => Ops.get_boolean(p, "feedback", false),
           "feedback_type" => Ops.get_string(p, "feedback_type", ""),
+	  "param-list"    => p.fetch("param-list",[]),
           "debug"         => Ops.get_boolean(p, "debug", true)
         }
       end
@@ -496,18 +500,19 @@ def splitParams(s)
       deep_copy(ret)
     end
 
-    def interactiveScript(shell, debug, scriptPath, current_logdir, scriptName)
+    def interactiveScript(shell, debug, scriptPath, params, current_logdir, scriptName)
       data = {}
       widget = ""
       SCR.Execute(path(".target.remove"), "/tmp/ay_opipe")
       SCR.Execute(path(".target.remove"), "/tmp/ay_ipipe")
       SCR.Execute(path(".target.bash"), "mkfifo -m 660 /tmp/ay_opipe", {})
       SCR.Execute(path(".target.bash"), "mkfifo -m 660 /tmp/ay_ipipe", {})
       execute = Builtins.sformat(
-        "%1 %2 %3 2&> %4/%5.log ",
+        "%1 %2 %3 %4 2> %5/%6.log ",
         shell,
         debug,
         scriptPath,
+	params,
         current_logdir,
         scriptName
       )
@@ -749,6 +754,7 @@ def Write(type, special)
 
       Builtins.foreach(scripts) do |s|
         scriptInterpreter = Ops.get_string(s, "interpreter", "shell")
+	params = s.fetch("param-list",[]).join(" ")
         scriptName = Ops.get_string(s, "filename", "")
         if scriptName == ""
           t = URL.Parse(Ops.get_string(s, "location", ""))
@@ -894,14 +900,16 @@ def Write(type, special)
                   "/bin/sh",
                   debug,
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )
               else
                 executionString = Builtins.sformat(
-                  "/bin/sh %1 %2 2&> %3/%4.log ",
+                  "/bin/sh %1 %2 %3 &> %4/%5.log ",
                   debug,
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )
@@ -926,14 +934,16 @@ def Write(type, special)
                   "/usr/bin/perl",
                   debug,
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )
               else
                 executionString = Builtins.sformat(
-                  "/usr/bin/perl %1 %2 2&> %3/%4.log ",
+                  "/usr/bin/perl %1 %2 %3 &> %4/%5.log ",
                   debug,
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )
@@ -957,13 +967,15 @@ def Write(type, special)
                   "/usr/bin/python",
                   "",
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )
               else
                 executionString = Builtins.sformat(
-                  "/usr/bin/python %1 2&> %2/%3.log ",
+                  "/usr/bin/python %1 %2 &> %3/%4.log ",
                   scriptPath,
+		  params,
                   current_logdir,
                   scriptName
                 )