Author: jsuchome Date: Mon Nov 21 14:58:42 2011 New Revision: 66883 URL: http://svn.opensuse.org/viewcvs/yast?rev=66883&view=rev Log: - replace mentioning of Installation with Initialization (bnc#730186) - 2.17.14 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=66883&r1=66882&r2=66883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Mon Nov 21 14:58:42 2011 @@ -1 +1 @@ -2.17.13 +2.17.14 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=66883&r1=66882&r2=66883&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 Nov 21 14:58:42 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 21 14:49:30 CET 2011 - jsuchome@suse.cz + +- replace mentioning of Installation with Initialization + (bnc#730186) +- 2.17.14 + +------------------------------------------------------------------- Tue Nov 15 16:26:33 CET 2011 - jsuchome@suse.cz - merge stdout and stderr windows 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=66883&r1=66882&r2=66883&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 Nov 21 14:58:42 2011 @@ -1,5 +1,5 @@ /** - * This client checks which kind of SLEPOS Branch server installation is running + * This client checks which kind of SLEPOS Branch server initialization is running * and gathers the data for appropriate Branch Server initialization script */ @@ -28,10 +28,10 @@ map args = GetInstArgs::argmap (); - // files for offline installation + // files for offline initialization // 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; + boolean offline_initialization= POSInstallation::offline_initialization; string offline_file = POSInstallation::offline_file; map labels = $[ @@ -42,42 +42,42 @@ // text entry label "POS_ADMIN_PASSWORD" : _("Branch Password"), ]; - map settings = POSInstallation::online_installation_settings; + map settings = POSInstallation::online_initialization_settings; /* - If *.tgz in /usr/share/SLEPOS/OIF/ exists, off-line installation is possible + If *.tgz in /usr/share/SLEPOS/OIF/ exists, off-line initialization 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_initialization = 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); + UI::ChangeWidget (`id (`offline_file), `Enabled, offline_initialization); + UI::ChangeWidget (`id (`browse), `Enabled, offline_initialization); foreach (string w_id, string val, settings, { - UI::ChangeWidget (`id (w_id), `Enabled, !offline_installation); + UI::ChangeWidget (`id (w_id), `Enabled, !offline_initialization); }); } term contents = `HBox (`HSpacing (3), `RadioButtonGroup (`id (`rb), `VBox ( - `Left (`RadioButton (`id (`offline_installation), `opt (`notify), + `Left (`RadioButton (`id (`offline_initialization), `opt (`notify), // radio button label - _("Offline Installation"), offline_installation)), + _("Offline Initialization"), offline_initialization)), `VSpacing (), `HBox ( `HSpacing (3), `VBox ( // label (file name is on next line) - `Left (`Label (_("Offline installation file:"))), + `Left (`Label (_("Offline Initialization File:"))), `ReplacePoint (`id (`rp_file), `HBox ( `Left (`Label (`id (`offline_file), offline_file)), // button label @@ -87,9 +87,9 @@ `HSpacing (3) ), `VSpacing (), - `Left (`RadioButton (`id (`online_installation), `opt (`notify), + `Left (`RadioButton (`id (`online_initialization), `opt (`notify), // radio button label - _("Online Installation"), !offline_installation) + _("Online Initialization"), !offline_initialization) ), `HBox (`HSpacing (3), `VBox ( `VSpacing (0.5), @@ -107,23 +107,23 @@ // help text - 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> + string help_text = _("<p><b>Offline Initialization</b><br> +Initialize Branch Server from an <b>Offline Initialization File</b> (OIF). If the file was not found automatically, use <b>Change</b> to enter its correct location.</p> -<p><b>Online Installation</b><br> +<p><b>Online Initialization</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"), + Wizard::SetContents (_("POS Branch Server Initialization"), 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); + UI::ChangeWidget (`id (`offline_initialization), `Enabled, false); } while (true) @@ -141,7 +141,7 @@ { string file = UI::AskForExistingFile (oif_directory, "*.tgz", // label for file selection dialog - _("Choose the Offline Installation File") + _("Choose the Offline Initialization File") ); if (file != nil) { @@ -152,14 +152,14 @@ )); } } - if (ret == `offline_installation || ret == `online_installation) + if (ret == `offline_initialization || ret == `online_initialization) { - offline_installation = ret == `offline_installation; + offline_initialization = ret == `offline_initialization; enable_disable_widgets (); } if (ret == `next) { - POSInstallation::offline_installation = offline_installation; + POSInstallation::offline_initialization = offline_initialization; POSInstallation::offline_file = offline_file; boolean missing = false; string write = ""; @@ -167,7 +167,7 @@ foreach (string key, [ "ALL_LDAPHOST", "BRANCH_LDAPBASE", "POS_ADMIN_PASSWORD"], { string value = (string) UI::QueryWidget (`id (key), `Value); - if (!offline_installation && value == "") + if (!offline_initialization && value == "") { string label = labels[key]:key; // error popup @@ -186,8 +186,8 @@ { continue; } - POSInstallation::online_installation_settings= settings; - if (!offline_installation) + POSInstallation::online_initialization_settings= settings; + if (!offline_initialization) { y2milestone ("writing new /etc/SLEPOS/branchserver.conf"); SCR::Write (.target.string, POSInstallation::bs_config_file, write); 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=66883&r1=66882&r2=66883&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 Nov 21 14:58:42 2011 @@ -70,7 +70,7 @@ ), `HSpacing (1)); // help text - string help_text = _("<p>Here you can see the progress of <b>Branch Server initialization</b>.</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> @@ -83,7 +83,7 @@ </p>"); // dialog caption - Wizard::SetContents (_("POS Branch Server Installation"), + Wizard::SetContents (_("POS Branch Server Initialization"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true ); @@ -101,11 +101,11 @@ Wizard::DisableNextButton (); Wizard::DisableBackButton (); - string cmd = sformat ("%1 -r -n 2>&1", POSInstallation::bs_install_cmd); - if (POSInstallation::offline_installation) + string cmd = sformat ("%1 -r -n 2>&1", POSInstallation::bs_init_cmd); + if (POSInstallation::offline_initialization) { cmd = sformat ("%1 -r -n -f %2 2>&1", - POSInstallation::bs_install_cmd, POSInstallation::offline_file); + POSInstallation::bs_init_cmd, POSInstallation::offline_file); } y2milestone ("Executing '%1'", cmd); UI::ChangeWidget (`id(`stdout), `LastLine, cmd + "\n\n"); @@ -126,7 +126,7 @@ y2milestone ("exit status of the script: %1", exit_status); UI::ReplaceWidget (`id (`rp_label), // text label - `Label (`id (`label), `opt (`boldFont), _("Installation is completed.")) + `Label (`id (`label), `opt (`boldFont), _("Initialization is completed.")) ); break; } @@ -139,7 +139,7 @@ SCR::Execute (.process.kill, pid, 15); UI::ReplaceWidget (`id (`rp_label), // text label - `Label (`id (`label), `opt (`boldFont), _("Installation has been aborted.")) + `Label (`id (`label), `opt (`boldFont), _("Initialization has been aborted.")) ); break; } 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=66883&r1=66882&r2=66883&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 Nov 21 14:58:42 2011 @@ -70,13 +70,13 @@ `Left (`RadioButton (`id (`sync), // radio button label _("Synchronize Image from Admin Server"), - !POSInstallation::offline_installation) + !POSInstallation::offline_initialization) ), `VSpacing (), `Left (`RadioButton (`id (`sync_local), // radio button label _("Synchronize Image Locally"), - POSInstallation::offline_installation) + POSInstallation::offline_initialization) ), `VSpacing (), `Left (`RadioButton (`id (`no_sync), 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=66883&r1=66882&r2=66883&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 Nov 21 14:58:42 2011 @@ -27,7 +27,7 @@ /** * BS initialization script */ -global string bs_install_cmd = "/usr/sbin/posInitBranchserver"; +global string bs_init_cmd = "/usr/sbin/posInitBranchserver"; /** * Path to synchronization script @@ -35,13 +35,13 @@ global string sync_cmd = "/usr/sbin/possyncimages"; /** - * Detection if offline installation of BS is running + * Detection if offline initialization of BS is running * (used during firstboot only) */ -global boolean offline_installation = false; +global boolean offline_initialization = false; /** - * Offline installation file + * Offline initialization file */ global string offline_file = ""; @@ -76,10 +76,10 @@ ]; /** - * Values that should be filled during BS online installation + * Values that should be filled during BS online initialization * (usable during firstboot stage) */ -global map online_installation_settings = $[ +global map online_initialization_settings = $[ "ALL_LDAPHOST" : "", "BRANCH_LDAPBASE" : "", "POS_ADMIN_PASSWORD" : "" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org