October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66281 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: gs Date: Thu Oct 6 12:11:30 2011 New Revision: 66281 URL: http://svn.opensuse.org/viewcvs/yast?rev=66281&view=rev Log: correct place for variables is inside foreach Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Thu Oct 6 12:11:30 2011 @@ -617,10 +617,6 @@ // global boolean DetectNetworkCards() { - string vlan_interface = ""; - string fcoe_vlan_interface = ""; - string dcb_capable = ""; - list <map> netcards = (list<map>)SCR::Read(.probe.netcard); y2milestone( "Detected netcards: %1", netcards ); @@ -650,8 +646,11 @@ map state_map = card["resource", "link", 0]:$[]; map info_map = $[]; map <string, string> status_map = $[]; - - // only call fipvlan <interface> for configured interfaces + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + string dcb_capable = ""; + + // only call 'fipvlan <interface>' for configured interfaces if ( state_map["state"]:false == true ) { vlan_interface = GetVlanInterface( card["dev_name"]:"" ); @@ -794,14 +793,16 @@ global boolean WriteCfgFiles() { list <map> netcards = GetNetworkCards(); + boolean success = false; - string command = ""; - map output = $[]; foreach ( map card, (list<map>)netcards, { if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { + string command = ""; + map output = $[]; + y2milestone( "Writing /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "FCOE_ENABLE", card[ "fcoe_enable"]:"no" ); if ( !success ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66280 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 08:58:26 2011 New Revision: 66280 URL: http://svn.opensuse.org/viewcvs/yast?rev=66280&view=rev Log: optimization - probe sound cards only once, not for each joystick Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Thu Oct 6 08:58:26 2011 @@ -249,6 +249,8 @@ define list<map<string,any> > joystick_table() { list<map<string,any> > content = []; + list<map> soundcards = (list<map>)SCR::Read(.probe.sound); + foreach(map js, Joystick::Detected(), { y2milestone("Adding joystick to table: %1", js); @@ -270,7 +272,6 @@ if (bus == "Gameport" && size(js["parent_unique_key"]:"") > 0) { - list<map> soundcards = (list<map>)SCR::Read(.probe.sound); string unique_key = js["parent_unique_key"]:""; map card = find(map c, soundcards, {return c["unique_key"]:"" == unique_key;}); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66279 - /tags/branch-Code-11-SP2-2_17_10/pos-installation/
by jsuchome＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: jsuchome Date: Thu Oct 6 08:52:14 2011 New Revision: 66279 URL: http://svn.opensuse.org/viewcvs/yast?rev=66279&view=rev Log: Created tag branch-Code-11-SP2-2_17_10 for pos-installation Added: tags/branch-Code-11-SP2-2_17_10/pos-installation/ (props changed) - copied from r66278, branches/SuSE-Code-11-SP2-Branch/pos-installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66278 - in /branches/SuSE-Code-11-SP2-Branch/pos-installation: ./ package/ src/clients/ src/modules/
by jsuchome＠svn2.opensuse.org 06 Oct '11

06 Oct '11

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-i… ============================================================================== --- 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-i… ============================================================================== --- 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(a)suse.cz + +- added support for SLEPOS firstboot (fate#312710) +- 2.17.10 + +------------------------------------------------------------------- Fri Jul 15 12:23:36 CEST 2011 - jsuchome(a)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-i… ============================================================================== --- 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/… + string oif_directory = "/usr/share/SLEPOS/OIF"; + boolean offline_installation= POSInstallation::offline_installation; + string offline_file = POSInstallation::offline_file; + + map<string,string> 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<string,string> 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 = _("FIXME fill this"); + + // 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-i… ============================================================================== --- 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 = _("FIXME fill this"); + + // 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-i… ============================================================================== --- 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 = _("FIXME fill this"); + + // 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-i… ============================================================================== --- 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<string,string> 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66277 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/StorageProposal.ycp
by fehr＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: fehr Date: Wed Oct 5 18:19:34 2011 New Revision: 66277 URL: http://svn.opensuse.org/viewcvs/yast?rev=66277&view=rev Log: fix invalid proposal on EFI system where GPT disklabel creation is enforced (bnc#709334) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Oct 5 18:19:34 2011 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de -- remove options "users,gid=users" from vfat fstab options for +- fix invalid proposal on EFI system where GPT disklabel creation + is enforced (bnc#709334) +- remove options "users,gid=users" from vfat fstab entries for /boot (bnc#722299) ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp Wed Oct 5 18:19:34 2011 @@ -3046,6 +3046,8 @@ if( NeedNewDisklabel(target[s]:$[]) ) { target[s,"disklabel"] = "gpt"; + target[s,"orig_label"] = target[s,"label"]:"msdos"; + target[s,"label"] = "gpt"; target[s,"del_ptable"] = true; } target[s,"partitions"] = @@ -3803,6 +3805,8 @@ if( NeedNewDisklabel(target[s]:$[]) ) { target[s,"disklabel"] = "gpt"; + target[s,"orig_label"] = target[s,"label"]:"msdos"; + target[s,"label"] = "gpt"; target[s,"del_ptable"] = true; } target[s,"partitions"] = -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66276 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageProposal.ycp
by fehr＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: fehr Date: Wed Oct 5 18:19:00 2011 New Revision: 66276 URL: http://svn.opensuse.org/viewcvs/yast?rev=66276&view=rev Log: fix invalid proposal on EFI system where GPT disklabel creation is enforced (bnc#709334) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 5 18:19:00 2011 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de +- fix invalid proposal on EFI system where GPT disklabel creation + is enforced (bnc#709334) - remove options "users,gid=users" from vfat fstab entries for /boot (bnc#722299) Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed Oct 5 18:19:00 2011 @@ -3046,6 +3046,8 @@ if( NeedNewDisklabel(target[s]:$[]) ) { target[s,"disklabel"] = "gpt"; + target[s,"orig_label"] = target[s,"label"]:"msdos"; + target[s,"label"] = "gpt"; target[s,"del_ptable"] = true; } target[s,"partitions"] = @@ -3803,6 +3805,8 @@ if( NeedNewDisklabel(target[s]:$[]) ) { target[s,"disklabel"] = "gpt"; + target[s,"orig_label"] = target[s,"label"]:"msdos"; + target[s,"label"] = "gpt"; target[s,"del_ptable"] = true; } target[s,"partitions"] = -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66275 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: fehr Date: Wed Oct 5 18:09:42 2011 New Revision: 66275 URL: http://svn.opensuse.org/viewcvs/yast?rev=66275&view=rev Log: remove options "users,gid=users" from vfat fstab entries for /boot (bnc#722299) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 5 18:09:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de + +- remove options "users,gid=users" from vfat fstab entries for + /boot (bnc#722299) + +------------------------------------------------------------------- Tue Sep 27 10:53:20 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Wed Oct 5 18:09:42 2011 @@ -1309,7 +1309,9 @@ } else if( !Arch::ia64() && contains( [`vfat, `ntfs], fsys ) ) { - fst_default = "users,gid=users"; + fst_default = ""; + if( substring(part["mount"]:"",0,5)!="/boot" ) + fst_default = "users,gid=users"; string enc = LangTypicalEncoding(); string code = Encoding::GetCodePage(enc); if( size(enc)>0 ) @@ -1360,6 +1362,8 @@ } } + if( substring(fst_default,0,1)=="," ) + fst_default = substring(fst_default,1); y2milestone( "DefaultFstabOptions dev %3 fsys %1 is %2", fsys, fst_default, dev ); return( fst_default ); } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 5 18:09:42 2011 @@ -3367,8 +3367,9 @@ ((partnum<=max_prim)==primary) && foreign_nr < 24 && Partitions::IsDosWinNtPartition(fsid) && - (!Arch::ia64() || (!IsEfiPartition(partition) && - partition["size_k"]:0 >= 1024*1024)) && + !Arch::ia64() && + !IsEfiPartition(partition) && + partition["size_k"]:0 >= 1024*1024 && contains( [`vfat, `ntfs], partition["used_fs"]:`none )) { new_partition["fstopt"] = -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66274 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: fehr Date: Wed Oct 5 17:24:56 2011 New Revision: 66274 URL: http://svn.opensuse.org/viewcvs/yast?rev=66274&view=rev Log: remove options "users,gid=users" from vfat fstab options for /boot (bnc#722299) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Oct 5 17:24:56 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de + +- remove options "users,gid=users" from vfat fstab options for + /boot (bnc#722299) + +------------------------------------------------------------------- Mon Sep 19 12:18:31 CEST 2011 - fehr(a)suse.de - fix bug that prevent mounting by-id and by-path for BTRFS volumes Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Wed Oct 5 17:24:56 2011 @@ -1310,7 +1310,9 @@ } else if( !Arch::ia64() && contains( [`vfat, `ntfs], fsys ) ) { - fst_default = "users,gid=users"; + fst_default = ""; + if( substring(part["mount"]:"",0,5)!="/boot" ) + fst_default = "users,gid=users"; string enc = LangTypicalEncoding(); string code = Encoding::GetCodePage(enc); if( size(enc)>0 ) @@ -1361,6 +1363,8 @@ } } + if( substring(fst_default,0,1)=="," ) + fst_default = substring(fst_default,1); y2milestone( "DefaultFstabOptions dev %3 fsys %1 is %2", fsys, fst_default, dev ); return( fst_default ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Wed Oct 5 17:24:56 2011 @@ -3367,8 +3367,9 @@ ((partnum<=max_prim)==primary) && foreign_nr < 24 && Partitions::IsDosWinNtPartition(fsid) && - (!Arch::ia64() || (!IsEfiPartition(partition) && - partition["size_k"]:0 >= 1024*1024)) && + !Arch::ia64() && + !IsEfiPartition(partition) && + partition["size_k"]:0 >= 1024*1024 && contains( [`vfat, `ntfs], partition["used_fs"]:`none )) { new_partition["fstopt"] = -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66273 - in /branches/tmp/lslezak: packager/ runlevel/ yast2/
by lslezak＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: lslezak Date: Wed Oct 5 16:31:36 2011 New Revision: 66273 URL: http://svn.opensuse.org/viewcvs/yast?rev=66273&view=rev Log: removed obsoleted/unused copies Removed: branches/tmp/lslezak/packager/ branches/tmp/lslezak/runlevel/ branches/tmp/lslezak/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66272 - /tags/branch-Code-11-SP2-2_21_98/gtk/
by lslezak＠svn2.opensuse.org 05 Oct '11

05 Oct '11

Author: lslezak Date: Wed Oct 5 15:21:12 2011 New Revision: 66272 URL: http://svn.opensuse.org/viewcvs/yast?rev=66272&view=rev Log: Created tag branch-Code-11-SP2-2_21_98 for gtk Added: tags/branch-Code-11-SP2-2_21_98/gtk/ - copied from r66271, branches/SuSE-Code-11-SP2-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0