Author: jsuchome Date: Thu Oct 6 08:51:50 2011 New Revision: 66278 URL: http://svn.opensuse.org/viewcvs/yast?rev=66278&view=rev Log: - added support for SLEPOS firstboot (fate#312710) - 2.17.10 Added: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp (with props) branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp (with props) branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp (with props) 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/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=66278&r1=66277&r2=66278&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Thu Oct 6 08:51:50 2011 @@ -1 +1 @@ -2.17.9 +2.17.10 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=66278&r1=66277&r2=66278&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 Thu Oct 6 08:51:50 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 7 10:03:58 CEST 2011 - jsuchome@suse.cz + +- added support for SLEPOS firstboot (fate#312710) +- 2.17.10 + +------------------------------------------------------------------- Fri Jul 15 12:23:36 CEST 2011 - jsuchome@suse.cz - fixed typo (bnc#703237) Added: 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=66278&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_initialization.ycp Thu Oct 6 08:51:50 2011 @@ -0,0 +1,213 @@ +/** + * This client checks which kind of SLEPOS Branch server installation is running + * and gathers the data for appropriate Branch Server initialization script + */ + +{ + textdomain "slepos-firstboot"; + + import "GetInstArgs"; + import "Label"; + import "Mode"; + import "Popup"; + import "Stage"; + import "Wizard"; + + import "POSInstallation"; + + + y2milestone ("SLEPOS firstboot initializaton (%1, %2)", Mode::mode (), Stage::stage ()); + + any ret = `auto; + + if (!Stage::firstboot ()) + { + y2milestone ("this should only run in firstboot stage: exiting"); + return ret; + } + + map args = GetInstArgs::argmap (); + + // files for offline installation + // http://svn.suse.de/viewvc/slepos/trunk/slepos/images/branchserver/root/usr/s... + string oif_directory = "/usr/share/SLEPOS/OIF"; + boolean offline_installation= POSInstallation::offline_installation; + string offline_file = POSInstallation::offline_file; + + map labels = $[ + // text entry label + "ALL_LDAPHOST" : _("LDAP URI of Admin Server"), + // text entry label + "ALL_LDAPBASE" : _("LDAP Base DN of Admin Server"), + // 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"), + ]; + + map settings = POSInstallation::online_installation_settings; + + /* + If *.tgz in /usr/share/SLEPOS/OIF/ exists, off-line installation is possible + */ + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1/*.tgz 2>/dev/null", oif_directory)); + list<string> offline_files = splitstring (out["stdout"]:"", "\n"); + if (offline_file == "" && offline_files != nil && size (offline_files) > 0) + { + offline_installation = true; + offline_file = offline_files[0]:""; + } + + + void enable_disable_widgets () { + + UI::ChangeWidget (`id (`offline_file), `Enabled, offline_installation); + UI::ChangeWidget (`id (`browse), `Enabled, offline_installation); + + foreach (string w_id, string val, settings, { + UI::ChangeWidget (`id (w_id), `Enabled, !offline_installation); + }); + } + + term contents = `HBox (`HSpacing (3), `RadioButtonGroup (`id (`rb), `VBox ( + + `Left (`RadioButton (`id (`offline_installation), `opt (`notify), + // radio button label + _("Offline Installation"), offline_installation)), + `VSpacing (), + `HBox ( + `HSpacing (3), + `VBox ( + // label (file name is on next line) + `Left (`Label (_("Offline installation file:"))), + `ReplacePoint (`id (`rp_file), `HBox ( + `Left (`Label (`id (`offline_file), offline_file)), + // button label + `Right (`PushButton (`id (`browse), _("&Change..."))) + )) + ), + `HSpacing (3) + ), + `VSpacing (), + `Left (`RadioButton (`id (`online_installation), `opt (`notify), + // radio button label + _("Online Installation"), !offline_installation) + ), + `HBox (`HSpacing (3), `VBox ( + `VSpacing (0.5), + // text entry label + `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"), + 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"), + settings["POS_ADMIN_PASSWORD"]:"") + ), `HSpacing (3)) + )), `HSpacing (3)); + + + // help text + string help_text = _("<p>FIXME fill this</p>"); + + // dialog caption + Wizard::SetContents (_("POS Branch Server Installation"), + contents, help_text, args["enable_back"]:true, args["enable_next"]:true + ); + + enable_disable_widgets (); + if (offline_files == nil || offline_files == []) + { + UI::ChangeWidget (`id (`offline_installation), `Enabled, false); + } + + while (true) + { + ret = UI::UserInput (); + if (ret == `back) + { + break; + } + if (ret == `abort && Popup::ConfirmAbort(`incomplete)) + { + break; + } + if (ret == `browse) + { + string file = UI::AskForExistingFile (oif_directory, "*.tgz", + // label for file selection dialog + _("Choose the Offline Installation File") + ); + 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..."))) + )); + } + } + if (ret == `offline_installation || ret == `online_installation) + { + offline_installation = ret == `offline_installation; + enable_disable_widgets (); + } + if (ret == `next) + { + POSInstallation::offline_installation = offline_installation; + POSInstallation::offline_file = offline_file; + boolean missing = false; + string write = ""; + foreach (string key, string val, settings, { + string value = (string) UI::QueryWidget (`id (key), `Value); + if (!offline_installation && value == "") + { + string label = labels[key]:key; + // error popup + Popup::Error (sformat (_("The value of '%1' is empty."), label)); + UI::SetFocus (`id (key)); + missing = true; + break; + } + else + { + settings[key] = value; + write = sformat ("%1%2=%3\n", write, key, value); + } + }); + if (missing) + { + continue; + } + POSInstallation::online_installation_settings= settings; + if (!offline_installation) + { + 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; + } + } + return ret; +} Added: 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=66278&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp Thu Oct 6 08:51:50 2011 @@ -0,0 +1,165 @@ +/** + * This client calls Branch Server initialization script and shows its output + */ + +{ + textdomain "slepos-firstboot"; + + import "GetInstArgs"; + import "Mode"; + import "Popup"; + import "Stage"; + import "Wizard"; + + import "POSInstallation"; + + + y2milestone ("SLEPOS firstboot installation (%1, %2)", Mode::mode (), Stage::stage ()); + + any ret = `auto; + + if (!Stage::firstboot ()) + { + y2milestone ("this should only run in firstboot stage: exiting"); + return ret; + } + + map args = GetInstArgs::argmap (); + map display_info = UI::GetDisplayInfo (); + boolean text_mode = display_info["TextMode"]:false; + + + term cont = `VBox ( + `VSpacing (0.4), + `ReplacePoint (`id (`rp_label), + // text label + `Label (`id (`label), _("Branch Server installation is running. Please wait...")) + ), + text_mode ? `VBox ( + // label + `Left (`Label (_("Setup script output"))), + `LogView (`id (`stdout), "", 6, 0), + `VSpacing (0.4), + // label + `Left (`Label (_("Error output"))), + `LogView (`id (`stderr), "", 2, 0) + ) : `VBox ( + // label + `Left (`Label (_("Setup script output"))), + `VWeight (3, `LogView (`id (`stdout), "", 8, 0)), + `VSpacing (0.4), + // label + `Left (`Label (_("Error output"))), + `VWeight (1, `LogView (`id (`stderr), "", 4, 0)) + ) + ); + + term contents = `HBox (`HSpacing (1), `VBox ( + `VSpacing (0.4), + cont, + `VSpacing (0.4) + ), `HSpacing (1)); + + // help text + string help_text = _("<p>FIXME fill this</p>"); + + // dialog caption + Wizard::SetContents (_("POS Branch Server Installation"), + contents, help_text, args["enable_back"]:true, args["enable_next"]:true + ); + + + integer pid = -1; + + void update_output () { + + 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); + if (POSInstallation::offline_installation) + { + cmd = sformat ("%1 -n -f %2", + POSInstallation::bs_install_cmd, POSInstallation::offline_file); + } + y2milestone ("Executing '%1'", cmd); + pid = (integer) SCR::Execute (.process.start_shell, cmd); + + while (true) + { + ret = (symbol) UI::PollInput(); + if (SCR::Read(.process.running, pid) != true) + { + 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); + UI::ReplaceWidget (`id (`rp_label), + // text label + `Label (`id (`label), `opt (`boldFont), _("Installation is completed.")) + ); + break; + } + else + { + update_output (); + } + if (ret == `cancel || ret == `abort) + { + SCR::Execute (.process.kill, pid, 15); + UI::ReplaceWidget (`id (`rp_label), + // text label + `Label (`id (`label), `opt (`boldFont), _("Installation has been aborted.")) + ); + break; + } + sleep (100); + } + + 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); + */ + + UI::NormalCursor (); + + Wizard::EnableBackButton (); + Wizard::EnableNextButton (); + + while (true) + { + ret = UI::UserInput (); + if (ret == `abort && !Popup::ConfirmAbort (`incomplete)) + { + continue; + } + else + { + break; + } + } + return ret; +} Added: 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=66278&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_synchronization.ycp Thu Oct 6 08:51:50 2011 @@ -0,0 +1,196 @@ +/** + * This client does Image synchronization + */ + +{ + textdomain "slepos-firstboot"; + + import "GetInstArgs"; + import "Label"; + import "Mode"; + import "Popup"; + import "Stage"; + import "Wizard"; + + import "POSInstallation"; + + + y2milestone ("SLEPOS firstboot synchronization (%1, %2)", Mode::mode (), Stage::stage ()); + + any ret = `auto; + + if (!Stage::firstboot ()) + { + y2milestone ("this should only run in firstboot stage: exiting"); + return ret; + } + + map args = GetInstArgs::argmap (); + map display_info = UI::GetDisplayInfo (); + boolean text_mode = display_info["TextMode"]:false; + + if (args["going_back"]:false) + { + return ret; + } + + term cont = `VBox ( + `VSpacing (0.4), + `ReplacePoint (`id (`rp_label), + // text label + `Label (`id (`label), _("Image synchronization is prepared.")) + ), + text_mode ? `VBox ( + // label + `Left (`Label (_("Synchronization script 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 output"))), + `VWeight (3, `LogView (`id (`stdout), "", 8, 0)), + `VSpacing (0.4), + // label + `Left (`Label (_("Error output"))), + `VWeight (1, `LogView (`id (`stderr), "", 4, 0)) + ) + ); + + term contents = `HBox (`HSpacing (1), `VBox ( + `VSpacing (0.4), + cont, + `VSpacing (0.4) + ), `HSpacing (1)); + + // help text + string help_text = _("<p>FIXME fill this</p>"); + + // dialog caption + Wizard::SetContents (_("POS Image Synchronization"), + contents, help_text, args["enable_back"]:true, args["enable_next"]:true + ); + + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (2), `VBox ( + `RadioButtonGroup (`id (`rb), `VBox ( + `VSpacing (), + `Left (`RadioButton (`id (`sync), + // radio button label + _("Synchronize Image from Admin Server"), + !POSInstallation::offline_installation) + ), + `VSpacing (), + `Left (`RadioButton (`id (`sync_local), + // radio button label + _("Synchronize Image Locally"), + POSInstallation::offline_installation) + ), + `VSpacing (), + `Left (`RadioButton (`id (`no_sync), + // radio button label + _("Do not Synchronize Image"))), + `VSpacing () + )), + `PushButton (`id (`ok), `opt (`default), Label::OKButton ()), + `VSpacing (0.5) + ), `HSpacing (2))); + + ret = UI::UserInput (); + symbol synchronize = (symbol) UI::QueryWidget (`id (`rb), `Value); + UI::CloseDialog (); + + if (synchronize == `no_sync) + { + return ret; + } + string cmd = POSInstallation::sync_cmd; + if (synchronize == `sync_local) + { + cmd = cmd + " --local"; + } + + UI::ReplaceWidget (`id (`rp_label), + // text label + `Label (`id (`label), _("Image synchronization is running. Please wait...")) + ); + + integer pid = -1; + + void update_output () { + + 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 (); + + y2milestone ("Executing '%1'", cmd); + pid = (integer) SCR::Execute (.process.start_shell, cmd); + + while (true) + { + ret = (symbol) UI::PollInput(); + if (SCR::Read(.process.running, pid) != true) + { + 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); + UI::ReplaceWidget (`id (`rp_label), + // text label + `Label (`id (`label), `opt (`boldFont), _("Synchronization is completed.")) + ); + break; + } + else + { + update_output (); + } + if (ret == `cancel || ret == `abort) + { + SCR::Execute (.process.kill, pid, 15); + UI::ReplaceWidget (`id (`rp_label), + // text label + `Label (`id (`label), `opt (`boldFont), _("Synchronization has been aborted.")) + ); + break; + } + sleep (100); + } + + SCR::Execute (.process.kill, pid); + + UI::NormalCursor (); + + Wizard::EnableBackButton (); + Wizard::EnableNextButton (); + + while (true) + { + ret = UI::UserInput (); + if (ret == `abort && !Popup::ConfirmAbort (`incomplete)) + { + continue; + } + else + { + break; + } + } + return ret; +} 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=66278&r1=66277&r2=66278&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 Thu Oct 6 08:51:50 2011 @@ -19,7 +19,31 @@ */ global string migrate_cmd = "/usr/lib/SLEPOS/migration/slepos_migrate.sh"; +/** + * Path to BS configuration file + */ +global string bs_config_file = "/etc/SLEPOS/branchserver.conf"; +/** + * BS initialization script + */ +global string bs_install_cmd = "/usr/sbin/posInitBranchserver"; + +/** + * Path to synchronization script + */ +global string sync_cmd = "/usr/sbin/possyncimages"; + +/** + * Detection if offline installation of BS is running + * (used during firstboot only) + */ +global boolean offline_installation = false; + +/** + * Offline installation file + */ +global string offline_file = ""; /** * path to file or directory with data for detection script @@ -51,4 +75,17 @@ "SLEPOS_Image_Server" : true ]; +/** + * Values that should be filled during BS online installation + * (usable during firstboot stage) + */ +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