[yast-commit] r56615 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml doc/examples/example.scripts.xml package/autoyast2.changes src/clients/inst_autoimage.ycp src/modules/AutoinstScripts.ycp

Author: ug Date: Fri Apr 3 13:08:57 2009 New Revision: 56615 URL: http://svn.opensuse.org/viewcvs/yast?rev=56615&view=rev Log: postpartitioning script invented Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/doc/examples/example.scripts.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoimage.ycp trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfileDetails.xml?rev=56615&r1=56614&r2=56615&view=diff ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Apr 3 13:08:57 2009 @@ -2051,12 +2051,13 @@ installation. </para> <para> - In the auto-installation process, four types of scripts can be executed and they + In the auto-installation process, five types of scripts can be executed and they will be described here in order of "appearance" during the installation. </para> <para> <itemizedlist> <listitem><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</listitem> + <listitem><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</listitem> <listitem><emphasis>chroot-scripts</emphasis> (after the package installation, before the first boot)</listitem> <listitem><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</listitem> <listitem><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</listitem> @@ -2153,6 +2154,85 @@ </table> </para> </section> + + <section id="postpartitioning-install.scripts"> + <title>Postpartitioning Scripts</title> + <note> + <para>Available starting from openSUSE 11.2 only (not SLES11).</para> + </note> + <para> + Executed after &yast2; did the partitioning and wrote the fstab. The empty system is mounted to /mnt already. + This type of script is available since openSUSE 11.2 (not SLES11). + </para> + <para> + The following elements must be between the <postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-sripts> tags + </para> + <para> + <table frame='top'> + <title>postpartitioning script XML representation</title> + <tgroup cols="3"> + <thead> + <row> + <entry>Element</entry> + <entry>Description</entry> + <entry>Comment</entry> + </row> + </thead> + <tbody> + <row> + <entry>location</entry> + <entry>you can define a location from where the script gets fetched. + Locations can be the same like for the profile (http,ftp,nfs,...). + <para><screen><location>http://10.10.0.1/myScript.sh</location>;</screen></para></entry> + <entry>either <location> or <source> must be defined</entry> + </row> + <row> + <entry>source</entry> + <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + to put the whole shell script into the XML profile, look at the location parameter. + + <para><screen><source> +<![CDATA[ +echo "Testing postpart script" > /mnt/postpart_test.txt +]]> +</source></screen></para></entry> + <entry>Either <location> or <source> must be defined</entry> + </row> + <row> + <entry>interpreter</entry> + <entry>the interpreter that must be used for the script. Supported options are shell and perl. + <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry>optional (default is shell)</entry> + </row> + <row> + <entry>filename</entry> + <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... + <para><screen><filename>myScript5.sh</filename></screen></para></entry> + <entry>optional. The default is the type of the script (pre-scripts) in this case</entry> + </row> + <row> + <entry>feedback</entry> + <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so + no confirmation is needed. + <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> + </row> + <row> + <entry>debug</entry> + <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + turned on. + <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> + </row> + </tbody> + </tgroup> + </table> + </para> + </section> + + + <section id="chroot.scripts"> <title>Chroot environment scripts</title> <para>Chroot scripts are executed before the machine reboots for the first time. Modified: trunk/autoinstallation/doc/examples/example.scripts.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/examples/example.scripts.xml?rev=56615&r1=56614&r2=56615&view=diff ============================================================================== --- trunk/autoinstallation/doc/examples/example.scripts.xml (original) +++ trunk/autoinstallation/doc/examples/example.scripts.xml Fri Apr 3 13:08:57 2009 @@ -68,5 +68,18 @@ </source> </script> </pre-scripts> + <postpartitioning-scripts config:type="list"> + <script> + <filename>postpart.sh</filename> + <interpreter>shell</interpreter> + <debug config:type="boolean">false</debug> + <feedback config:type="boolean">true</feedback> + <source><![CDATA[ +touch /mnt/testfile +echo Hi +]]> + </source> + </script> + </postpartitioning-scripts> </scripts> </profile> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=56615&r1=56614&r2=56615&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Apr 3 13:08:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 3 13:08:47 CEST 2009 - ug@suse.de + +- postpartitioning script invented + +------------------------------------------------------------------- Wed Apr 1 16:11:08 CEST 2009 - ug@suse.de - storage lib compatibility with "used_by" Modified: trunk/autoinstallation/src/clients/inst_autoimage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autoimage.ycp?rev=56615&r1=56614&r2=56615&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoimage.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoimage.ycp Fri Apr 3 13:08:57 2009 @@ -16,6 +16,9 @@ import "Report"; import "AutoinstImage"; import "AutoinstSoftware"; +import "AutoinstScripts"; + +AutoinstScripts::Write("postpartitioning-scripts", false); if (!AutoinstSoftware::imaging) return `auto; Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=56615&r1=56614&r2=56615&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Fri Apr 3 13:08:57 2009 @@ -33,6 +33,10 @@ /* Init scripts */ global list<map> init = []; + /* postpart scripts */ + global list<map> postpart = []; + + /* Merged scripts */ global list<map> merged = []; @@ -89,6 +93,12 @@ return p; }) ); + result = (list<map>)union(result, maplist (map p, postpart, + ``{ + p = add(p,"type","postpartitioning-scripts"); + return p; + }) + ); return result; } @@ -115,6 +125,7 @@ post = []; chroot = []; init = []; + postpart = []; y2milestone("Merged %1", merged); // split @@ -127,6 +138,8 @@ init = add(init,s); else if (s["type"]:"" == "chroot-scripts") chroot = add(chroot,s); + else if (s["type"]:"" == "postpartitioning-scripts") + postpart = add(postpart,s); }); @@ -168,6 +181,16 @@ "debug":p["debug"]:true ]); }); + list<map> expostpart = maplist (map p, postpart, ``{ + return ($["filename":p["filename"]:"", + "interpreter": p["interpreter"]:"", + "source":p["source"]:"", + "location":p["location"]:"", + "feedback":p["feedback"]:false, + "debug":p["debug"]:true + ]); + }); + map result = $[]; if (size(expre) > 0 ) result["pre-scripts"] = expre; @@ -177,6 +200,8 @@ result["chroot-scripts"] = exchroot; if (size(exinit) > 0 ) result["init-scripts"] = exinit; + if (size(expostpart) > 0 ) + result["postpartitioning-scripts"] = expostpart; return result; @@ -220,11 +245,13 @@ init = s["init-scripts"]:[]; post = s["post-scripts"]:[]; chroot = s["chroot-scripts"]:[]; + postpart = s["postpartitioning-scripts"]:[]; pre = Resolve_relurl(pre); init = Resolve_relurl(init); post = Resolve_relurl(post); chroot = Resolve_relurl(chroot); + postpart = Resolve_relurl(postpart); merged = mergeScripts(); y2debug("merged: %1", merged); @@ -290,6 +317,19 @@ { summary = Summary::AddLine(summary, Summary::NotConfigured()); } + summary = Summary::AddHeader(summary, _("Postpartitioning Scripts")); + if (size( init) > 0 ) + { + summary = Summary::OpenList(summary); + foreach(map script, postpart, ``{ + summary = Summary::AddListItem(summary, script["filename"]:"" ); + }); + summary = Summary::CloseList(summary); + } + else + { + summary = Summary::AddLine(summary, Summary::NotConfigured()); + } return summary; } @@ -388,6 +428,10 @@ { return _("Chroot"); } + else if (type == "postpartitioning-scripts") + { + return _("Postpartitioning"); + } return _("Unknown"); } @@ -549,6 +593,10 @@ { scripts = filter(map s, post, ``(s["network_needed"]:false)); } + else if (type == "postpartitioning-scripts" ) + { + scripts = postpart; + } else { y2error("Unsupported script type"); @@ -559,7 +607,7 @@ string tmpdirString = ""; string current_logdir = ""; - if (type == "pre-scripts") + if (type == "pre-scripts" || type == "postpartitioning-scripts") { tmpdirString = sformat("%1/%2", AutoinstConfig::tmpDir, type); SCR::Execute (.target.mkdir, tmpdirString); @@ -600,12 +648,12 @@ } string scriptPath = ""; - if (type == "pre-scripts") + if ( type == "pre-scripts" || type == "postpartitioning-scripts" ) { // y2milestone("doing /sbin/udevcontrol stop_exec_queue now to prevent trouble if one is doing partitioning in a pre-script"); // SCR::Execute( .target.bash, "/sbin/udevcontrol stop_exec_queue" ); scriptPath = sformat("%1/%2/%3", AutoinstConfig::tmpDir, type, scriptName); - y2milestone("Writing pre script into %1", scriptPath); + y2milestone("Writing %1 script into %2", type, scriptPath); if (s["location"]:"" != "") { y2debug("getting script: %1", s["location"]:"" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org