Author: jsuchome
Date: Mon Oct 24 09:43:43 2011
New Revision: 66529
URL: http://svn.opensuse.org/viewcvs/yast?rev=66529&view=rev
Log:
- require less data for online installation
- write posInitBranchserver outputs to the files
- log the full command to the output window
- 2.17.11
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
branches/SuSE-Code-11-SP2-Branch/pos-installation/src/modules/POSInstallation.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=66529&r1=66528&r2=66529&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original)
+++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Mon Oct 24 09:43:43 2011
@@ -1 +1 @@
-2.17.10
+2.17.11
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=66529&r1=66528&r2=66529&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 Mon Oct 24 09:43:43 2011
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Oct 24 09:33:36 CEST 2011 - jsuchome@suse.cz
+
+- require less data for online installation
+- write posInitBranchserver outputs to the files
+- log the full command to the output window
+- 2.17.11
+
+-------------------------------------------------------------------
Wed Sep 7 10:03:58 CEST 2011 - jsuchome@suse.cz
- added support for SLEPOS firstboot (fate#312710)
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=66529&r1=66528&r2=66529&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 Mon Oct 24 09:43:43 2011
@@ -38,17 +38,10 @@
// text entry label
"ALL_LDAPHOST" : _("LDAP URI of Admin Server"),
// text entry label
- "ALL_LDAPBASE" : _("LDAP Base DN of Admin Server"),
+ "BRANCH_LDAPBASE" : _("Branch/Location LDAP Base DN"),
// text entry label
- "ALL_BRANCHLDAP" : _("LDAP URI of Branch Server"),
- // text entry label
- "BRANCH_LDAPBASE" : _("LDAP Base DN of Branch Server"),
- // text entry label
- "POS_ADMIN_DN" : _("Administrator DN"),
- // text entry label
- "POS_ADMIN_PASSWORD" : _("Administrator Password"),
+ "POS_ADMIN_PASSWORD" : _("Branch Password"),
];
-
map settings = POSInstallation::online_installation_settings;
/*
@@ -104,19 +97,10 @@
`InputField (`id ("ALL_LDAPHOST"), `opt (`hstretch), _("LDAP URI of &Admin Server"),
settings["ALL_LDAPHOST"]:""),
// text entry label
- `InputField (`id ("ALL_LDAPBASE"), `opt (`hstretch), _("&LDAP Base DN of Admin Server"),
- settings["ALL_LDAPBASE"]:""),
- // text entry label
- `InputField (`id ("ALL_BRANCHLDAP"), `opt (`hstretch), _("LDAP URI of &Branch Server"),
- settings["ALL_BRANCHLDAP"]:""),
- // text entry label
- `InputField (`id ("BRANCH_LDAPBASE"), `opt (`hstretch), _("LDA&P Base DN of Branch Server"),
+ `InputField (`id ("BRANCH_LDAPBASE"), `opt (`hstretch), _("Branch/&Location LDAP Base DN"),
settings["BRANCH_LDAPBASE"]:""),
// text entry label
- `InputField (`id ("POS_ADMIN_DN"), `opt (`hstretch), _("Administrator &DN"),
- settings["POS_ADMIN_DN"]:""),
- // text entry label
- `Password (`id ("POS_ADMIN_PASSWORD"), `opt (`hstretch), _("Administrator &Password"),
+ `Password (`id ("POS_ADMIN_PASSWORD"), `opt (`hstretch), _("Branch &Password"),
settings["POS_ADMIN_PASSWORD"]:"")
), `HSpacing (3))
)), `HSpacing (3));
@@ -156,11 +140,6 @@
if (file != nil)
{
offline_file = file;
- /*
- UI::ReplaceWidget (`id (`rp_file),
- `Left (`Label (`id (`offline_file), sformat (_("Offline installation file: %1"), offline_file)))
- );
- */
UI::ReplaceWidget (`id (`rp_file), `HBox (
`Left (`Label (`id (`offline_file), offline_file)),
`Right (`PushButton (`id (`browse), _("&Change...")))
@@ -178,7 +157,9 @@
POSInstallation::offline_file = offline_file;
boolean missing = false;
string write = "";
- foreach (string key, string val, settings, {
+ // list widgets in the order of appearence
+ foreach (string key, [ "ALL_LDAPHOST", "BRANCH_LDAPBASE", "POS_ADMIN_PASSWORD"], {
+
string value = (string) UI::QueryWidget (`id (key), `Value);
if (!offline_installation && value == "")
{
@@ -204,7 +185,6 @@
{
y2milestone ("writing new /etc/SLEPOS/branchserver.conf");
SCR::Write (.target.string, POSInstallation::bs_config_file, write);
-// SCR::Write (.target.string, "/tmp/SLEPOS/branchserver.conf", write);
}
break;
}
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=66529&r1=66528&r2=66529&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 Mon Oct 24 09:43:43 2011
@@ -5,6 +5,7 @@
{
textdomain "slepos-firstboot";
+ import "FileUtils";
import "GetInstArgs";
import "Mode";
import "Popup";
@@ -27,6 +28,9 @@
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 logs_directory = "/var/log/pos";
term cont = `VBox (
@@ -37,7 +41,7 @@
),
text_mode ? `VBox (
// label
- `Left (`Label (_("Setup script output"))),
+ `Left (`Label (_("Setup script ('posInitBranchserver') output"))),
`LogView (`id (`stdout), "", 6, 0),
`VSpacing (0.4),
// label
@@ -45,7 +49,7 @@
`LogView (`id (`stderr), "", 2, 0)
) : `VBox (
// label
- `Left (`Label (_("Setup script output"))),
+ `Left (`Label (_("Setup script ('posInitBranchserver') output"))),
`VWeight (3, `LogView (`id (`stdout), "", 8, 0)),
`VSpacing (0.4),
// label
@@ -92,8 +96,9 @@
POSInstallation::bs_install_cmd, POSInstallation::offline_file);
}
y2milestone ("Executing '%1'", cmd);
+ UI::ChangeWidget (`id(`stdout), `LastLine, cmd + "\n\n");
pid = (integer) SCR::Execute (.process.start_shell, cmd);
-
+ integer exit_status = 0;
while (true)
{
ret = (symbol) UI::PollInput();
@@ -108,8 +113,8 @@
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);
+ exit_status = (integer) SCR::Read (.process.status, pid);
+ y2milestone ("exit status of the script: %1", exit_status);
UI::ReplaceWidget (`id (`rp_label),
// text label
`Label (`id (`label), `opt (`boldFont), _("Installation is completed."))
@@ -134,18 +139,25 @@
SCR::Execute (.process.kill, pid);
- // FIXME save the logs?
- /*
- string logfile = "/var/log/susemanager_setup.log";
- string errfile = "/var/log/susemanager_setup.err";
- string stdout = (string) UI::QueryWidget (`id (`stdout), `Value);
- SCR::Write (.target.string, logfile, stdout);
- string stderr = (string) UI::QueryWidget (`id (`stderr), `Value);
- SCR::Write (.target.string, errfile, stderr);
- */
+ // save the log files
+ if (FileUtils::CheckAndCreatePath (logs_directory))
+ {
+ 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));
+ }
+
UI::NormalCursor ();
+ if (exit_status != nil && exit_status > 249 && exit_status < 254)
+ {
+ // error message, %1 is exit code (number)
+ Popup::Message (sformat (_("There has been a problem with network device configuration (%1).
+Proceed according to the manual."), exit_status));
+ }
+
Wizard::EnableBackButton ();
Wizard::EnableNextButton ();
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=66529&r1=66528&r2=66529&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 Mon Oct 24 09:43:43 2011
@@ -42,7 +42,7 @@
),
text_mode ? `VBox (
// label
- `Left (`Label (_("Synchronization script output"))),
+ `Left (`Label (_("Synchronization script ('possyncimages') output"))),
`LogView (`id (`stdout), "", 6, 0),
`VSpacing (0.4),
// label
@@ -50,7 +50,7 @@
`LogView (`id (`stderr), "", 2, 0)
) : `VBox (
// label
- `Left (`Label (_("Synchronization script output"))),
+ `Left (`Label (_("Synchronization script ('possyncimages') output"))),
`VWeight (3, `LogView (`id (`stdout), "", 8, 0)),
`VSpacing (0.4),
// label
@@ -133,6 +133,7 @@
Wizard::DisableBackButton ();
y2milestone ("Executing '%1'", cmd);
+ UI::ChangeWidget (`id(`stdout), `LastLine, cmd + "\n\n");
pid = (integer) SCR::Execute (.process.start_shell, cmd);
while (true)
Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/modules/POSInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-installation/src/modules/POSInstallation.ycp?rev=66529&r1=66528&r2=66529&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/modules/POSInstallation.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/modules/POSInstallation.ycp Mon Oct 24 09:43:43 2011
@@ -81,11 +81,7 @@
*/
global map online_installation_settings = $[
"ALL_LDAPHOST" : "",
- "ALL_BRANCHLDAP" : "ldap://localhost",
- "ALL_LDAPBASE" : "",
"BRANCH_LDAPBASE" : "",
- "POS_ADMIN_DN" : "",
"POS_ADMIN_PASSWORD" : ""
];
-
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org