Author: ug Date: Thu Mar 25 13:49:08 2010 New Revision: 61494 URL: http://svn.opensuse.org/viewcvs/yast?rev=61494&view=rev Log: 'notification' option added to scripts Modified: trunk/autoinstallation/doc/RulesAndClasses.xml trunk/autoinstallation/doc/ScriptsSection.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstScripts.ycp trunk/autoinstallation/src/schema/scripts.rnc Modified: trunk/autoinstallation/doc/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/RulesAndClasses.xml?rev=61494&r1=61493&r2=61494&view=diff ============================================================================== --- trunk/autoinstallation/doc/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/RulesAndClasses.xml Thu Mar 25 13:49:08 2010 @@ -351,7 +351,7 @@ <para> If you are unsure about a value on your system, start an autoinstallation. If the proposal shows up, switch to the console via CTRL+ALT+F2 and run - <screen>y2base ayast_probe ncurses + <screen>/usr/lib/YaST2/bin/y2base ayast_probe ncurses </screen>. It might help to to turn the confirmation on for this, so that the installation does not start in the background while you are watching the values. The textbox with the values is scrollable. Modified: trunk/autoinstallation/doc/ScriptsSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/ScriptsSection.xml?rev=61494&r1=61493&r2=61494&view=diff ============================================================================== --- trunk/autoinstallation/doc/ScriptsSection.xml (original) +++ trunk/autoinstallation/doc/ScriptsSection.xml Thu Mar 25 13:49:08 2010 @@ -131,6 +131,13 @@ <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> + <row> + <entry>notification</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><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -213,6 +220,13 @@ <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> + <row> + <entry>notification</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><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -304,6 +318,13 @@ <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> + <row> + <entry>notification</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><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -396,6 +417,13 @@ <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> + <row> + <entry>notification</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><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61494&r1=61493&r2=61494&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Mar 25 13:49:08 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 25 13:45:53 CET 2010 - ug@suse.de + +- "notification" option added to scripts + +------------------------------------------------------------------- Thu Mar 18 12:17:36 CET 2010 - ug@suse.de - prefer the filename of a remote script instead of the Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=61494&r1=61493&r2=61494&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Thu Mar 25 13:49:08 2010 @@ -745,6 +745,9 @@ string executionString = ""; boolean showFeedback = s["feedback"]:false; + if( s["notification"]:"" != "" ) + Popup::ShowFeedback( s["notification"]:"" ); + if (scriptInterpreter == "shell") { string debug = ( s["debug"]:true ? "-x" : "" ); @@ -792,6 +795,9 @@ } string feedback = ""; + if( s["notification"]:"" != "" ) + Popup::ClearFeedback(); + if( executionString != "" ) { if( showFeedback ) { feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); Modified: trunk/autoinstallation/src/schema/scripts.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/scripts.rnc?rev=61494&r1=61493&r2=61494&view=diff ============================================================================== --- trunk/autoinstallation/src/schema/scripts.rnc (original) +++ trunk/autoinstallation/src/schema/scripts.rnc Thu Mar 25 13:49:08 2010 @@ -38,7 +38,8 @@ element location { text }? & source? & debug? & - feedback? + feedback? & + element notification { text }? } autoinstall-init-script = element script { @@ -55,7 +56,8 @@ source? & debug? & feedback? & - feedback_type? + feedback_type? & + element notification { text }? } chrooted = element chrooted { BOOLEAN } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org