Author: jsuchome Date: Tue Nov 15 16:40:40 2011 New Revision: 66803 URL: http://svn.opensuse.org/viewcvs/yast?rev=66803&view=rev Log: - merge stdout and stderr windows - do not overwrite old log files - added the help texts (bnc#730186) - 2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION?rev=66803&r1=66802&r2=66803&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Tue Nov 15 16:40:40 2011 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes?rev=66803&r1=66802&r2=66803&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes Tue Nov 15 16:40:40 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 15 16:26:33 CET 2011 - jsuchome@suse.cz + +- merge stdout and stderr windows +- do not overwrite old log files +- added the help texts (bnc#730186) +- 2.17.13 + +------------------------------------------------------------------- Thu Nov 10 11:28:12 CET 2011 - jsuchome@suse.cz - call posInitBranchServer with -r for reinitialization (bnc#728971) Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp?rev=66803&r1=66802&r2=66803&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp Tue Nov 15 16:40:40 2011 @@ -107,7 +107,13 @@ // help text - string help_text = _("<p>FIXME fill this</p>"); + string help_text = _("<p><b>Offline Installation</b><br> +Initialize Branch Server from an Offline Installation File (OIF). If the file was not found automatically, use <b>Change</b> to enter its correct location.</p> + +<p><b>Online Installation</b><br> +Initialize Branch Server using an internet connection to the Admin Server. + +Enter <b>LDAP URI of Admin Server</b> (like <tt>ldaps://admin.mycomp.us</tt>), <b>Branch/Location LDAP Base DN</b> (for example <tt>cn=store1,ou=myunit,o=mycomp,c=us</tt>) and the <b>Password</b> associated with the given Branch/Location.</p>"); // dialog caption Wizard::SetContents (_("POS Branch Server Installation"), Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp?rev=66803&r1=66802&r2=66803&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp Tue Nov 15 16:40:40 2011 @@ -19,6 +19,11 @@ any ret = `auto; + if (GetInstArgs::going_back ()) + { + return ret; + } + if (!Stage::firstboot ()) { y2milestone ("this should only run in firstboot stage: exiting"); @@ -28,10 +33,22 @@ map args = GetInstArgs::argmap (); map display_info = UI::GetDisplayInfo (); boolean text_mode = display_info["TextMode"]:false; - string stdout_file = "posInitBranchserver.stdout"; - string stderr_file = "posInitBranchserver.stderr"; + string stdout_file = "posInitBranchserver.log-1"; string logs_directory = "/var/log/pos"; + // find the latest log file + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls %1/posInitBranchserver.log-* 2>/dev/null | cut -f 2 -d - | sort -nr", + logs_directory)); + if (out["stdout"]:"" != "") + { + list<string> nums = splitstring (out["stdout"]:"", "\n"); + integer last = tointeger (nums[0]:"0"); + if (last != nil) + { + stdout_file = sformat ("posInitBranchserver.log-%1", last + 1); + } + } term cont = `VBox ( `VSpacing (0.4), @@ -39,22 +56,10 @@ // text label `Label (`id (`label), _("Branch Server installation is running. Please wait...")) ), - text_mode ? `VBox ( - // label - `Left (`Label (_("Setup script ('posInitBranchserver') output"))), - `LogView (`id (`stdout), "", 6, 0), - `VSpacing (0.4), - // label - `Left (`Label (_("Error output"))), - `LogView (`id (`stderr), "", 2, 0) - ) : `VBox ( + `VBox ( // label `Left (`Label (_("Setup script ('posInitBranchserver') output"))), - `VWeight (3, `LogView (`id (`stdout), "", 8, 0)), - `VSpacing (0.4), - // label - `Left (`Label (_("Error output"))), - `VWeight (1, `LogView (`id (`stderr), "", 4, 0)) + `LogView (`id (`stdout), "", 8, 0) ) ); @@ -65,7 +70,17 @@ ), `HSpacing (1)); // help text - string help_text = _("<p>FIXME fill this</p>"); + string help_text = _("<p>Here you can see the progress of <b>Branch Server initialization</b>.</p> + +<p> +The initialization could fail from different reasons. For name or DN related errors, check the value of BranchServer DN entered in previous step.</p> +<p> +For network related errors, it's probably necessary to reconfigure network settings early in the sequence. Consult SLEPOS user guide, Chapter 5.1, <b>BranchServer Network configuration</b> for details. +</p> + +<p> +In case of various service errors, consult SLEPOS user guide, Chapter 4.6.1, <b>Adding BranchServer services</b>. Then check your LDAP tree or respective scService entry. +</p>"); // dialog caption Wizard::SetContents (_("POS Branch Server Installation"), @@ -80,19 +95,16 @@ string line = (string)SCR::Read (.process.read_line, pid); if (line != nil && line != "") UI::ChangeWidget (`id(`stdout), `LastLine, line + "\n"); - string err = (string)SCR::Read (.process.read_line_stderr, pid); - if (err!= nil && err != "") - UI::ChangeWidget (`id(`stderr), `LastLine, err + "\n"); } UI::BusyCursor (); Wizard::DisableNextButton (); Wizard::DisableBackButton (); - string cmd = sformat ("%1 -r -n", POSInstallation::bs_install_cmd); + string cmd = sformat ("%1 -r -n 2>&1", POSInstallation::bs_install_cmd); if (POSInstallation::offline_installation) { - cmd = sformat ("%1 -r -n -f %2", + cmd = sformat ("%1 -r -n -f %2 2>&1", POSInstallation::bs_install_cmd, POSInstallation::offline_file); } y2milestone ("Executing '%1'", cmd); @@ -107,11 +119,8 @@ update_output (); // explicitely check the process buffer after exit (bnc#488799) string buf = (string) SCR::Read (.process.read, pid); - string err_buf = (string) SCR::Read (.process.read_stderr, pid); if (buf != nil && buf != "") UI::ChangeWidget (`id(`stdout), `LastLine, buf + "\n"); - if (err_buf != nil && err_buf != "") - UI::ChangeWidget (`id(`stderr), `LastLine, err_buf + "\n"); exit_status = (integer) SCR::Read (.process.status, pid); y2milestone ("exit status of the script: %1", exit_status); @@ -144,8 +153,6 @@ { SCR::Write (.target.string, logs_directory + "/" + stdout_file, (string) UI::QueryWidget (`id (`stdout), `Value)); - SCR::Write (.target.string, logs_directory + "/" + stderr_file, - (string) UI::QueryWidget (`id (`stderr), `Value)); } Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp?rev=66803&r1=66802&r2=66803&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp Tue Nov 15 16:40:40 2011 @@ -40,23 +40,10 @@ // text label `Label (`id (`label), _("Image synchronization is prepared.")) ), - text_mode ? `VBox ( - // label - `Left (`Label (_("Synchronization script ('possyncimages') output"))), - `LogView (`id (`stdout), "", 6, 0), - `VSpacing (0.4), - // label - `Left (`Label (_("Error output"))), - `LogView (`id (`stderr), "", 2, 0) - ) : `VBox ( - // label - `Left (`Label (_("Synchronization script ('possyncimages') output"))), - `VWeight (3, `LogView (`id (`stdout), "", 8, 0)), - `VSpacing (0.4), - // label - `Left (`Label (_("Error output"))), - `VWeight (1, `LogView (`id (`stderr), "", 4, 0)) - ) + // label + `Left (`Label (_("Synchronization script ('possyncimages') output"))), + `LogView (`id (`stdout), "", 6, 0), + `VSpacing (0.4) ); term contents = `HBox (`HSpacing (1), `VBox ( @@ -66,7 +53,11 @@ ), `HSpacing (1)); // help text - string help_text = _("<p>FIXME fill this</p>"); + string help_text = _("<p> +Online Image Synchronization may need a longer time, depending on the Admin Server internet connection. +</p> +<p> +Possible network problems indicate the need for a change in the Network Configuration step earlier in the sequence.</p>"); // dialog caption Wizard::SetContents (_("POS Image Synchronization"), @@ -93,11 +84,39 @@ _("Do not Synchronize Image"))), `VSpacing () )), - `PushButton (`id (`ok), `opt (`default), Label::OKButton ()), + `HBox ( + `PushButton (`id (`help), Label::HelpButton ()), + `PushButton (`id (`ok), `opt (`default), Label::OKButton ()) + ), `VSpacing (0.5) ), `HSpacing (2))); - ret = UI::UserInput (); + // help text for popup + string popup_help = _(" +<p> +<b>Synchronize Images from Admin Server</b><br> +Download and install the latest image versions. This action requires working internet connection to the Admin Server. +</p> +<p> +<b>Synchronize Images Locally</b><br> +Install the locally available images. +</p> +<p> +<b>Do not Synchronize Images</b><br> +Image synchronization is skipped. It should be run manually later, using the <tt>possyncimages</tt> script.</p>"); + + while (true) + { + ret = UI::UserInput (); + if (ret == `help) + { + Wizard::ShowHelp (popup_help); + } + if (ret == `ok) + { + break; + } + } symbol synchronize = (symbol) UI::QueryWidget (`id (`rb), `Value); UI::CloseDialog (); @@ -110,6 +129,7 @@ { cmd = cmd + " --local"; } + cmd = cmd + " 2>&1"; UI::ReplaceWidget (`id (`rp_label), // text label @@ -123,9 +143,6 @@ string line = (string)SCR::Read (.process.read_line, pid); if (line != nil && line != "") UI::ChangeWidget (`id(`stdout), `LastLine, line + "\n"); - string err = (string)SCR::Read (.process.read_line_stderr, pid); - if (err!= nil && err != "") - UI::ChangeWidget (`id(`stderr), `LastLine, err + "\n"); } UI::BusyCursor (); @@ -144,11 +161,8 @@ update_output (); // explicitely check the process buffer after exit (bnc#488799) string buf = (string) SCR::Read (.process.read, pid); - string err_buf = (string) SCR::Read (.process.read_stderr, pid); if (buf != nil && buf != "") UI::ChangeWidget (`id(`stdout), `LastLine, buf + "\n"); - if (err_buf != nil && err_buf != "") - UI::ChangeWidget (`id(`stderr), `LastLine, err_buf + "\n"); integer status = (integer) SCR::Read (.process.status, pid); y2internal ("exit status of the script: %1", status); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org