Author: locilka
Date: Thu Apr 3 16:40:09 2008
New Revision: 46043
URL: http://svn.opensuse.org/viewcvs/yast?rev=46043&view=rev
Log:
- Removed Winkeys support during installation (bnc 376248).
- Fixed the decision-making process which images fits the best.
- Added new control file entries to adjust the Community
Repositories and Add-Ons during installation.
- Cosmetic changes when initializing the wizard steps according to
control file.
- Fixed untarring bzip2 or gzip-based images.
Modified:
trunk/installation/control/control.openSUSE.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_finish.ycp
trunk/installation/src/clients/inst_worker_initial.ycp
trunk/installation/src/config/preferences.yast2
trunk/installation/src/include/inst_inc_first.ycp
trunk/installation/src/modules/ImageInstallation.ycp
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Thu Apr 3 16:40:09 2008
@@ -24,12 +24,18 @@
true
false
true
+
<!-- bnc #359115 comment #14 -->
true
false
<!-- Offer online repositories feature in the installation -->
false
+ true
+
+ <!-- Offer add-ons in the installation -->
+ true
+ false
<!-- FATE #301937, Save /root content from the installation system to the installed system -->
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Apr 3 16:40:09 2008
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Wed Apr 3 16:40:16 CEST 2008 - locilka@suse.cz
+
+- Removed Winkeys support during installation (bnc 376248).
+- Fixed the decision-making process which images fits the best.
+- Added new control file entries to adjust the Community
+ Repositories and Add-Ons during installation.
+- Cosmetic changes when initializing the wizard steps according to
+ control file.
+- Fixed untarring bzip2 or gzip-based images.
+
+-------------------------------------------------------------------
Tue Apr 1 13:12:00 CEST 2008 - locilka@suse.cz
- Automatic configuration can be newly defined by control file. Two
Modified: trunk/installation/src/clients/inst_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_finish.ycp (original)
+++ trunk/installation/src/clients/inst_finish.ycp Thu Apr 3 16:40:09 2008
@@ -169,7 +169,9 @@
list<map> steps = maplist (string s, stage["steps"]:[], {
s = s + "_finish";
+ y2milestone ("Calling inst_finish script: %1 (Info)", s);
// TODO: check if client exists
+// client doesn't need to exist on purpose
map info = (map)WFM::CallFunction (s, ["Info"]);
if (info == nil) {
@@ -185,12 +187,19 @@
steps_count = steps_count + info["steps"]:1;
return info;
});
+
stage["steps"] = filter (map s, steps, {
return s != nil;
});
+
return stage;
});
+y2milestone ("These inst_finish stages will be called:");
+foreach (map stage, stages, {
+ y2milestone ("Stage: %1", stage);
+});
+
stages = filter (map s, stages, {
return size (s["steps"]:[]) > 0;
});
Modified: trunk/installation/src/clients/inst_worker_initial.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_initial.ycp?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_initial.ycp (original)
+++ trunk/installation/src/clients/inst_worker_initial.ycp Thu Apr 3 16:40:09 2008
@@ -54,12 +54,11 @@
// All stages
SetUIContent();
+ SetDiskActivationModule();
+
// Cleanup and other settings
InitFirstStageInstallationSystem();
- SetDiskActivationModule();
- AdjustStepsAccordingToInstallationSettings();
-
// Redraw steps before mouse is initialized
// Bugzilla #296406
UpdateWizardSteps ();
Modified: trunk/installation/src/config/preferences.yast2
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/preferences.yast2?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/src/config/preferences.yast2 (original)
+++ trunk/installation/src/config/preferences.yast2 Thu Apr 3 16:40:09 2008
@@ -13,6 +13,9 @@
KeySysSwitchNext="Alt+Tab"
KeySysSwitchLast="Alt+Shift+Tab"
+# Disable Windows key
+Win95Keys=0
+
# Colors
ColorActiveTitleBar="rgb:4e/6f/9f"
ColorNormalTitleBar="rgb:c3/c3/c3"
Modified: trunk/installation/src/include/inst_inc_first.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_first.ycp?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_first.ycp (original)
+++ trunk/installation/src/include/inst_inc_first.ycp Thu Apr 3 16:40:09 2008
@@ -37,15 +37,55 @@
* Sets inital language and other settings.
*/
void SetInitialInstallation () {
+ y2milestone ("Adjusting language settings");
+ UI::SetLanguage (Language::language, Installation::encoding);
+ WFM::SetLanguage (Language::language, "UTF-8");
+ UI::RecordMacro (Directory::logdir + "/macro_inst_initial.ycp");
+
// properly set up initial language
Installation::encoding = Console::SelectFont (Language::language);
if (UI::GetDisplayInfo()["HasFullUtf8Support"]:true) {
Installation::encoding = "UTF-8";
}
-
- ProductControl::DisableModule ("add-on");
- ProductControl::DisableModule ("productsources");
+ y2milestone ("Adjusting first stage modules");
+
+ boolean show_addons = ProductFeatures::GetBooleanFeature ("globals", "show_addons");
+ boolean addons_default = ProductFeatures::GetBooleanFeature ("globals", "addons_default");
+ // default fallback
+ if (show_addons == nil) show_addons = true;
+ if (addons_default == nil) addons_default = false;
+
+ y2milestone ("Control file definition for add-on, visible: %1, selected: %2",
+ show_addons, addons_default);
+ if (show_addons) {
+ ProductControl::DisableModule ("add-on");
+ } else {
+ ProductControl::EnableModule ("add-on");
+ }
+ Installation::add_on_selected = addons_default;
+
+ boolean show_online_repositories = ProductFeatures::GetBooleanFeature ("globals", "show_online_repositories");
+ boolean online_repositories_default = ProductFeatures::GetBooleanFeature ("globals", "online_repositories_default");
+ // default fallback
+ if (show_online_repositories == nil) show_online_repositories = false;
+ if (online_repositories_default == nil) online_repositories_default = true;
+
+ y2milestone ("Control file definition for productsources, visible: %1, selected: %2",
+ show_online_repositories, online_repositories_default);
+ if (show_online_repositories) {
+ ProductControl::EnableModule ("productsources");
+ } else {
+ ProductControl::DisableModule ("productsources");
+ }
+ Installation::productsources_selected = online_repositories_default;
+
+ y2milestone ("Disabling second stage modules");
+ // First-stage users module will enable them again only if needed
+ ProductControl::DisableModule ("root");
+ ProductControl::DisableModule ("user");
+ ProductControl::DisableModule ("auth");
+ y2milestone ("Adjusting automatic configuration");
// FATE #303396, Make second stage non-interactive
boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature ("globals", "enable_autoconfiguration");
boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature ("globals", "autoconfiguration_default");
@@ -56,15 +96,6 @@
ProductControl::SetUseAutomaticConfiguration (autoconfiguration_default == true);
// Enables or disables some modules, etc.
AdjustAutomaticInstallation();
-
- // First-stage users module will enable them again only if needed
- ProductControl::DisableModule ("root");
- ProductControl::DisableModule ("user");
- ProductControl::DisableModule ("auth");
-
- UI::SetLanguage (Language::language, Installation::encoding);
- WFM::SetLanguage (Language::language, "UTF-8");
- UI::RecordMacro (Directory::logdir + "/macro_inst_initial.ycp");
}
void InitFirstStageInstallationSystem () {
Modified: trunk/installation/src/modules/ImageInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=46043&r1=46042&r2=46043&view=diff
==============================================================================
--- trunk/installation/src/modules/ImageInstallation.ycp (original)
+++ trunk/installation/src/modules/ImageInstallation.ycp Thu Apr 3 16:40:09 2008
@@ -140,7 +140,7 @@
cmd = sformat ("lzmadec < '%1' | tar --totals -C '%2' -xf -", String::Quote (image), String::Quote (target));
// bzip2, gzip
} else {
- cmd = sformat ("tar --totals -xf '%1' -C -xf '%2'", String::Quote (image), String::Quote (target));
+ cmd = sformat ("tar --totals -C '%2' -xf '%1'", String::Quote (image), String::Quote (target));
}
y2milestone ("Calling: %1", cmd);
@@ -398,7 +398,7 @@
possible_patterns[pattern] = image;
}
- matching_pattern_sizes[pattern] = size (image);
+ matching_pattern_sizes[pattern] = size (image["images"]:[]);
});
y2milestone ("Matching patterns: %1, sizes: %2", possible_patterns, matching_pattern_sizes);
@@ -417,7 +417,7 @@
last_pattern = "";
foreach (string pattern, map image, possible_patterns, {
- if (matching_pattern_sizes[pattern]:0 > last_size && DoesPatternFitBetter (last_pattern, pattern)) {
+ if (matching_pattern_sizes[pattern]:0 >= last_size && DoesPatternFitBetter (last_pattern, pattern)) {
last_size = matching_pattern_sizes[pattern]:0;
result = image;
last_pattern = pattern;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org