Mailinglist Archive: opensuse-commit (2130 mails)
| < Previous | Next > |
commit yast2-installation
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 01 Apr 2008 22:36:21 +0200
- Message-id: <20080401203621.681C0678336@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Apr 1 22:36:21 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-03-28
14:14:41.000000000 +0100
+++ yast2-installation/yast2-installation.changes 2008-04-01
17:25:36.000000000 +0200
@@ -1,0 +2,27 @@
+Tue Apr 1 13:12:00 CEST 2008 - locilka@xxxxxxx
+
+- Automatic configuration can be newly defined by control file. Two
+ new variables have been added enable_autoconfiguration and
+ autoconfiguration_default.
+- New functionality to select the best-matching image for image
+ installation if more than one fit.
+- 2.16.28
+
+-------------------------------------------------------------------
+Tue Apr 1 12:36:52 CEST 2008 - jsrain@xxxxxxx
+
+- added live installation workflow to default control file
+- updated inst_finish clients handling for live installation
+
+-------------------------------------------------------------------
+Tue Apr 1 10:15:34 CEST 2008 - jsrain@xxxxxxx
+
+- merged texts from proofread
+
+-------------------------------------------------------------------
+Mon Mar 31 16:42:40 CEST 2008 - locilka@xxxxxxx
+
+- There are currently two possible patterns/desktops that can use
+ kdm: kde4-kdm and kdebase3-kdm (bnc #372506).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.27.tar.bz2
New:
----
yast2-installation-2.16.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.gj9852/_old 2008-04-01 22:35:47.000000000 +0200
+++ /var/tmp/diff_new_pack.gj9852/_new 2008-04-01 22:35:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.27)
+# spec file for package yast2-installation (Version 2.16.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.27
+Version: 2.16.28
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.27.tar.bz2
+Source0: yast2-installation-2.16.28.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer
sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# anyxml -> barexml (bnc #366867)
@@ -105,7 +105,7 @@
Lukas Ocilka <locilka@xxxxxxx>
%prep
-%setup -n yast2-installation-2.16.27
+%setup -n yast2-installation-2.16.28
%build
%{prefix}/bin/y2tool y2autoconf
@@ -171,6 +171,21 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Apr 01 2008 locilka@xxxxxxx
+- Automatic configuration can be newly defined by control file. Two
+ new variables have been added enable_autoconfiguration and
+ autoconfiguration_default.
+- New functionality to select the best-matching image for image
+ installation if more than one fit.
+- 2.16.28
+* Tue Apr 01 2008 jsrain@xxxxxxx
+- added live installation workflow to default control file
+- updated inst_finish clients handling for live installation
+* Tue Apr 01 2008 jsrain@xxxxxxx
+- merged texts from proofread
+* Mon Mar 31 2008 locilka@xxxxxxx
+- There are currently two possible patterns/desktops that can use
+ kdm: kde4-kdm and kdebase3-kdm (bnc #372506).
* Fri Mar 28 2008 locilka@xxxxxxx
- Automatic configuration has been moved from the end of the first
stage to the second stage. It's non-interactive (FATE #303396).
@@ -559,7 +574,7 @@
- Calling the client from control file.
- Adjusted RPM dependencies (.anyxml SCR agent).
- 2.15.37
-* Sun Jul 29 2007 locilka@xxxxxxx
+* Mon Jul 30 2007 locilka@xxxxxxx
- Fixed curl parameters for network test in first stage (#295484).
* Thu Jul 26 2007 mzugec@xxxxxxx
- set variables VNC and USE_SSH in S07-medium (#294485)
@@ -695,7 +710,7 @@
* Mon May 21 2007 locilka@xxxxxxx
- Fixed release-notes desktop file.
- 2.15.25
-* Thu May 17 2007 locilka@xxxxxxx
+* Fri May 18 2007 locilka@xxxxxxx
- Progress dialog for initializing installation sources.
- 2.15.24
* Tue May 15 2007 locilka@xxxxxxx
@@ -887,7 +902,7 @@
- Rereading all SCR Agents in case of installation workflow changed
by Add-On product (#239055).
- Calling PackageLock::Check before Pkg calls (#238556).
-* Sun Jan 28 2007 locilka@xxxxxxx
+* Mon Jan 29 2007 locilka@xxxxxxx
- Removed tv and bluetooth hardware proposals from SLES control
file. There are no such modules in that product (#238759).
* Mon Jan 22 2007 locilka@xxxxxxx
@@ -1551,7 +1566,7 @@
- Making "SLP Catalog" selection bigger (maximum ncurses size)
(#168718)
- 2.13.90
-* Tue Apr 25 2006 jsrain@xxxxxxx
+* Wed Apr 26 2006 jsrain@xxxxxxx
- fixed service proposal in SLES control file (#159771)
* Tue Apr 25 2006 locilka@xxxxxxx
- Return `next instead of `ok in case of SLP Add-On Source (#165989)
@@ -1577,7 +1592,7 @@
* Fri Apr 21 2006 jdsn@xxxxxxx
- added proxy support for registration browser (#165891)
- 2.13.83
-* Thu Apr 20 2006 jsrain@xxxxxxx
+* Fri Apr 21 2006 jsrain@xxxxxxx
- handle installation restart with repeating last step (#167561)
- 2.13.82
* Thu Apr 20 2006 jdsn@xxxxxxx
@@ -1593,10 +1608,10 @@
* Wed Apr 19 2006 locilka@xxxxxxx
- Added more debugging messages to the inst_proposal (#162831)
- 2.13.78
-* Tue Apr 18 2006 jsrain@xxxxxxx
+* Wed Apr 19 2006 jsrain@xxxxxxx
- display proper popup when aborting add-on product installation
(#159689)
-* Tue Apr 18 2006 jdsn@xxxxxxx
+* Wed Apr 19 2006 jdsn@xxxxxxx
- in inst_suse_register:
- busy/waiting popups (#163366, #164794)
- text changes (#165509)
@@ -1620,7 +1635,7 @@
- Skip popup and unnecessary work if there are no online update
sources for add-ons (#167233).
- 2.13.73
-* Fri Apr 14 2006 jsrain@xxxxxxx
+* Sat Apr 15 2006 jsrain@xxxxxxx
- prevent from changing installation mode and system for update once
it is selected (#165832)
- added add-on products to installation/update proposal for SLES/SLED
@@ -1650,7 +1665,7 @@
- fixed Product.ycp - relnotes_url might be defined as an empty
string (#165314).
- 2.13.66
-* Tue Apr 11 2006 jsrain@xxxxxxx
+* Wed Apr 12 2006 jsrain@xxxxxxx
- fixed boot if root is on LVM (initialize udev symlinks) (#163073)
- 2.13.65
* Tue Apr 11 2006 jdsn@xxxxxxx
@@ -1795,7 +1810,7 @@
installed Linux found. Just disabling 'Update' and 'Other'
options in that case (#157695).
- removed calling uml_finish, client doesn't has been dropped.
-* Fri Mar 17 2006 jsrain@xxxxxxx
+* Sat Mar 18 2006 jsrain@xxxxxxx
- added AytoYaST support for add-on products
- 2.13.39
* Fri Mar 17 2006 locilka@xxxxxxx
@@ -1860,7 +1875,7 @@
change (#144783)
* Wed Mar 08 2006 lrupp@xxxxxxx
- added suseRegister to Requires
-* Tue Mar 07 2006 jdsn@xxxxxxx
+* Wed Mar 08 2006 jdsn@xxxxxxx
- added functionality to skip suse register and/or online update
- 2.13.28
* Tue Mar 07 2006 jsrain@xxxxxxx
@@ -1932,7 +1947,7 @@
- 2.13.16
* Tue Feb 14 2006 jsrain@xxxxxxx
- fixed add-on product workflow and proposal merging
-* Mon Feb 13 2006 jsrain@xxxxxxx
+* Tue Feb 14 2006 jsrain@xxxxxxx
- updated patchs on add-on product CD according to spec
- 2.13.15
* Mon Feb 13 2006 visnov@xxxxxxx
@@ -2489,7 +2504,7 @@
- updated fvwmrc.yast2 (see bug #43796)
* Tue Aug 17 2004 nashif@xxxxxxx
- XFree86 -> xorg-x11 (#43832)
-* Fri Aug 13 2004 nashif@xxxxxxx
+* Sat Aug 14 2004 nashif@xxxxxxx
- Fixed update (#43795)
* Wed Aug 11 2004 nashif@xxxxxxx
- Copy EULA to installed system for later use in firstboot module
@@ -2692,7 +2707,7 @@
* Thu Mar 18 2004 mvidner@xxxxxxx
- Fall back to runlevel 3 if we accidentally don't set it
in the installation proposal. It would be 0 (#35662).
-* Wed Mar 17 2004 nashif@xxxxxxx
+* Thu Mar 18 2004 nashif@xxxxxxx
- Add runlevel to s390 proposal
- remove x11 from autoinst workflow (handled differently)
* Wed Mar 17 2004 nashif@xxxxxxx
@@ -2869,7 +2884,7 @@
- removed obsolete inst_hw_config.ycp and inst_confirm_abort.ycp
* Sun Aug 31 2003 arvin@xxxxxxx
- use Popup::ConfirmAbort
-* Sat Aug 30 2003 arvin@xxxxxxx
+* Sun Aug 31 2003 arvin@xxxxxxx
- moved reactivation of network to yast2-network (bug #29561)
- moved display of into.txt into separate file
* Thu Aug 28 2003 ms@xxxxxxx
@@ -2959,7 +2974,7 @@
- start apache as doc_server if suse_help_viewer isn't provided
by kdebase3-SuSE (25436)
- 2.7.39
-* Sat Mar 15 2003 kkaempf@xxxxxxx
+* Sun Mar 16 2003 kkaempf@xxxxxxx
- gdm2 might not be installed yet but earmarked for installation
(#25410)
- 2.7.38
@@ -3203,7 +3218,7 @@
- provides/obsoletes the old yast
* Mon Sep 16 2002 kkaempf@xxxxxxx
- remove unneeded Save() functions (#19591)
-* Thu Sep 12 2002 fehr@xxxxxxx
+* Fri Sep 13 2002 fehr@xxxxxxx
- remove obsolete LVM and MD initialisation in inst_mode.ycp
- 2.6.63
* Thu Sep 12 2002 kkaempf@xxxxxxx
@@ -3264,7 +3279,7 @@
- 2.6.45
* Wed Sep 04 2002 arvin@xxxxxxx
- fixed provide/obsolete of trans packages (bug #18691)
-* Tue Sep 03 2002 kkaempf@xxxxxxx
+* Wed Sep 04 2002 kkaempf@xxxxxxx
- adapt update workflow to package manager
- 2.6.41
* Mon Sep 02 2002 arvin@xxxxxxx
@@ -3282,7 +3297,7 @@
- start in textmode for ssh installation (bug #18571)
* Thu Aug 29 2002 kkaempf@xxxxxxx
- close source in inst_finish (#18508)
-* Wed Aug 28 2002 kkaempf@xxxxxxx
+* Thu Aug 29 2002 kkaempf@xxxxxxx
- trigger cache copying at end
- 2.6.35
* Wed Aug 28 2002 kkaempf@xxxxxxx
++++++ yast2-installation-2.16.27.tar.bz2 -> yast2-installation-2.16.28.tar.bz2
++++++
++++ 2490 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/control/docs/control-section.xml
new/yast2-installation-2.16.28/control/docs/control-section.xml
--- old/yast2-installation-2.16.27/control/docs/control-section.xml
2008-03-26 11:20:36.000000000 +0100
+++ new/yast2-installation-2.16.28/control/docs/control-section.xml
2008-04-01 13:12:53.000000000 +0200
@@ -358,17 +358,31 @@
<itemizedlist>
<listitem><para>(boolean) <emphasis>enable_firewall</emphasis>
- firewall will proposed as
either enabled or disabled in the network
proposal.</para></listitem>
+
<listitem><para>(boolean) <emphasis>enable_clone</emphasis> -
clonning feature
will be either enabled or disabled.</para></listitem>
+
<listitem><para>(boolean)
<emphasis>skip_language_dialog</emphasis> - the language
dialog might be skipped (if language already
selected).</para></listitem>
+
<listitem><para>(boolean)
<emphasis>show_online_repositories</emphasis> - either shows
or hides the "online repositories" feature
check-box.</para></listitem>
+
<!-- bnc #359115 comment #14 -->
<listitem><para>(boolean)
<emphasis>root_password_as_first_user</emphasis> - automatically
selects or deselects the checkbox that makes Users
configuration to set the password
entered for a first user also for the user root. If not
defined, default is
<emphasis>false</emphasis></para></listitem>
+
+ <!-- FATE #303396: Make second stage non-interactive -->
+ <listitem><para>(boolean)
<emphasis>enable_autoconfiguration</emphasis> - enables a check box
+ in dialog that offers to switch the automatic configuration
either on or off.
+ Default is false.</para></listitem>
+
+ <listitem><para>(boolean)
<emphasis>autoconfiguration_default</emphasis> - defines a default
+ value whether to use the automatic configuration. It works
even if
+ <emphasis>enable_autoconfiguration</emphasis> is turned
off, but user would not be able
+ to change it. Default is false.</para></listitem>
</itemizedlist>
</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/copy_logs_finish.ycp
new/yast2-installation-2.16.28/src/clients/copy_logs_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/copy_logs_finish.ycp
2007-05-18 10:44:04.000000000 +0200
+++ new/yast2-installation-2.16.28/src/clients/copy_logs_finish.ycp
2008-04-01 13:11:10.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: copy_logs_finish.ycp 29684 2006-04-04 18:07:34Z jsrain $
+ * $Id: copy_logs_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $
*
*/
@@ -40,7 +40,7 @@
"steps" : 1,
// progress step title
"title" : _("Copying log files to installed system..."),
- "when" : [ `installation, `update, `autoinst ],
+ "when" : [ `installation, `live_installation, `update, `autoinst ],
];
}
else if (func == "Write")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/desktop_finish.ycp
new/yast2-installation-2.16.28/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/desktop_finish.ycp
2008-02-18 12:18:14.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/desktop_finish.ycp
2008-03-31 16:45:53.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: desktop_finish.ycp 44576 2008-02-18 10:50:34Z coolo $
+ * $Id: desktop_finish.ycp 45893 2008-03-31 14:45:52Z locilka $
*
*/
@@ -53,32 +53,36 @@
// check who provides suse_help_viewer
// if kdebase3-SuSE isn't installed by apache or apache2, set
/etc/sysconfig/apache:DOC_SERVER
- if ((!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected
("kdebase3-SuSE")))
+ if (
+ (!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected
("kdebase3-SuSE")))
+ &&
+ (!(Pkg::IsProvided ("kdebase4-openSUSE") || Pkg::IsSelected
("kdebase4-openSUSE")))
&&
(Pkg::IsProvided ("apache2") || Pkg::IsSelected ("apache2")
|| Pkg::IsProvided ("apache") || Pkg::IsSelected ("apache")))
{
doc_server = true;
}
+
// this detects WM and DM according to selected patterns and
// installed packages
if ( !Mode::update () )
{
- map<string,map<string,string> > desktop_data = $[
+ map <string,map <string, any> > desktop_data = $[
"gnome" : $[
- "package" : "gdm",
+ "package" : ["gdm"],
"wm" : "gnome",
"dm" : "gdm",
"cursor" : "DMZ",
],
"kde" : $[
- "package" : "kde4-kdm",
+ "package" : ["kde4-kdm", "kdebase3-kdm"],
"wm" : "kde",
"dm" : "kdm",
"cursor" : "DMZ",
],
"twm" : $[
- "package" : "xorg-x11",
+ "package" : ["xorg-x11"],
"wm" : "",
"dm" : "xdm",
"cursor" : "DMZ",
@@ -90,22 +94,26 @@
string default_cursor = "DMZ";
string selected_desktop = DefaultDesktop::Desktop ();
- if (selected_desktop != "" && selected_desktop != nil)
- {
+
+ // DefaultDesktop has been set
+ if (selected_desktop != "" && selected_desktop != nil) {
y2milestone ("Desktop was set to %1", selected_desktop);
default_wm = desktop_data[selected_desktop, "wm"]:"";
default_dm = desktop_data[selected_desktop, "dm"]:"";
default_cursor = desktop_data[selected_desktop, "cursor"]:"";
- }
- else
- {
+
+ // KDE, GNOME CD ... or desktop just not set at all
+ } else {
list<map<string,any> > patterns
= Pkg::ResolvableDependencies ("", `pattern, "");
+
patterns = filter (map<string,any> p, patterns, {
return p["status"]:nil == `installed
|| p["status"]:nil == `selected;
});
+
list<list<string> > packages2 = [];
+
foreach (map<string,any> p, patterns, {
y2internal ("P: %1", p);
list<map<string,any> > deps = p["dependencies"]:[];
@@ -120,27 +128,27 @@
}));
y2internal ("Packages2: %1", packages2);
});
+
list<string> packages = (list<string>)toset (flatten (packages2));
y2debug ("All packages in selected patterns: %1", packages);
- list<string> desktop_order = ["gnome", "kde"];
+ list <string> desktop_order = ["gnome", "kde"];
boolean desktop_found = false;
string pattern_desktop = "gnome";
// check what packages are in the patterns
// and adjust logon and window manager according to it
- find (string d, desktop_order, {
- if (contains (packages, desktop_data[d, "package"]:""))
- {
- if (! desktop_found)
- {
+ foreach (string d, desktop_order, {
+ if (desktop_found) break;
+ foreach (string one_package, desktop_data[d, "package"]:[], {
+ if (desktop_found) break;
+ if (contains (packages, one_package)) {
desktop_found = true;
pattern_desktop = d;
y2milestone ("Setting desktop according to pattern to
%1", pattern_desktop);
}
- }
- return desktop_found;
+ });
});
// if no desktop was found according to pattern, try
@@ -149,35 +157,26 @@
desktop_order = add (desktop_order, "twm");
desktop_order = prepend (desktop_order, pattern_desktop);
desktop_found = false;
- find (string d, desktop_order, {
- string package = desktop_data[d, "package"]:"";
- if (Pkg::IsProvided (package)
- || Pkg::IsSelected (package))
- {
+
+ foreach (string d, desktop_order, {
+ if (desktop_found) break;
+
+ foreach (string package, desktop_data[d, "package"]:[], {
+ if (Pkg::IsProvided (package) && (Pkg::PkgInstalled
(package) || Pkg::IsSelected (package))) {
y2milestone ("package %1 selected or installed",
package);
- if (! desktop_found)
- {
- desktop_found = true;
- default_dm = desktop_data[d, "dm"]:"";
- y2milestone (
- "Setting logon manager %1 - package selecteed",
- default_dm);
- default_wm = desktop_data[d, "wm"]:"";
- y2milestone (
- "Setting window manager %1 - package selecteed",
- default_wm);
- default_cursor
- = desktop_data[d, "cursor"]:default_cursor;
- y2milestone (
- "Setting cursor theme %1 - package selected",
- default_cursor);
- }
- }
- else if (! desktop_found)
- {
- y2milestone ("Package %1 not selected or installed,
trying next desktop...", package);
+ desktop_found = true;
+ default_dm = desktop_data[d, "dm"]:"";
+ y2milestone ("Setting logon manager %1 - package
selecteed", default_dm);
+ default_wm = desktop_data[d, "wm"]:"";
+ y2milestone ("Setting window manager %1 - package
selecteed", default_wm);
+ default_cursor = desktop_data[d,
"cursor"]:default_cursor;
+ y2milestone ("Setting cursor theme %1 - package
selected", default_cursor);
}
- return desktop_found;
+
+ y2milestone ("Package %1 not selected or installed, trying
next desktop...", package);
+ });
+
+ return desktop_found;
});
}
y2milestone ("Default desktop: %1", default_wm);
@@ -206,6 +205,8 @@
SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN,
dm_shutdown);
}
+
+ y2milestone ("sysconfig/displaymanager/DISPLAYMANAGER=%1", default_dm);
SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm);
SCR::Write (.sysconfig.displaymanager, nil);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_complex_welcome.ycp
new/yast2-installation-2.16.28/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_complex_welcome.ycp
2008-02-27 11:16:03.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_complex_welcome.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -135,7 +135,7 @@
// help text for initial (first time) language screen
string help_text = _("<p>
-Choose the <b>Language</b> and the <b>Keyborad layout</b> to be used during
+Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during
installation and for the installed system.
</p>
") +
@@ -161,8 +161,8 @@
// help text, continued
_("<p>
-You can select <b>Abort</b> installation at any time to abort the
-installation process.
+Select <b>Abort</b> to abort the
+installation process any time.
</p>
");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp
new/yast2-installation-2.16.28/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp
2008-03-27 13:38:39.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_congratulate.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 45790 2008-03-27 12:38:38Z locilka $
+ * $Id: inst_congratulate.ycp 45912 2008-04-01 07:17:26Z jsrain $
*/
{
@@ -185,8 +185,7 @@
help = help + _("<p>Use <b>Clone</b> if you want to create an AutoYaST
profile.
AutoYaST is a way to do a complete SUSE Linux installation without user
interaction. AutoYaST
needs a profile to know what the installed system should look like. If this
option is
-selected, a profile of the current system is stored in /root/autoinst.xml.</p>
-");
+selected, a profile of the current system is stored in
<tt>/root/autoinst.xml</tt>.</p>");
if (show_zmd_turnoff_checkbox)
help = help + turnoff_zmd_help;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_finish.ycp
new/yast2-installation-2.16.28/src/clients/inst_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_finish.ycp 2008-03-28
13:37:21.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_finish.ycp 2008-04-01
13:11:10.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell <arvin@xxxxxxx>
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: inst_finish.ycp 45831 2008-03-28 12:37:20Z locilka $
+ * $Id: inst_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -45,6 +45,7 @@
"mouse",
"copy_files",
"copy_systemfiles",
+ "live_copy_files",
"switch_scr",
],
],
@@ -54,6 +55,7 @@
"steps" : [
"ldconfig",
"save_config",
+ "live_save_config",
"runlevel",
"desktop",
"fonts",
@@ -93,6 +95,7 @@
// progress stage
"label" : _("Prepare system for initial boot"),
"steps" : [
+ "live_runme_at_boot",
"vm",
"driver_update2",
// no second stage if possible
@@ -157,12 +160,16 @@
run_type = `update;
else if (Mode::autoinst ())
run_type = `autoinst;
+else if (Mode::live_installation ())
+ run_type = `live_installation;
integer steps_count = 0;
stages = maplist (map<string,any> stage, stages, {
list<map> steps = maplist (string s, stage["steps"]:[], {
s = s + "_finish";
+
+// TODO: check if client exists
map info = (map)WFM::CallFunction (s, ["Info"]);
if (info == nil) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_mode.ycp
new/yast2-installation-2.16.28/src/clients/inst_mode.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_mode.ycp 2008-03-17
11:14:48.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_mode.ycp 2008-04-01
13:13:48.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain <jsrain@xxxxxxx>
* Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: inst_mode.ycp 45508 2008-03-17 10:14:47Z locilka $
+ * $Id: inst_mode.ycp 45927 2008-04-01 11:13:47Z locilka $
*
*/
@@ -172,12 +172,16 @@
_("In&clude Add-On Products from Separate Media"),
Installation::add_on_selected
)),
- `Left (`CheckBox (
- `id (`use_automatic_configuration), `opt(`notify),
- // check box
- _("&Use Automatic Configuration"),
- ProductControl::GetUseAutomaticConfiguration()
- ))
+ (InstData::enable_autoconfiguration == true ?
+ `Left (`CheckBox (
+ `id (`use_automatic_configuration), `opt(`notify),
+ // check box
+ _("&Use Automatic Configuration"),
+ ProductControl::GetUseAutomaticConfiguration()
+ ))
+ :
+ `Empty()
+ )
),
`HStretch()
);
@@ -205,22 +209,19 @@
// help text for installation option
(show_online_repositories == true ? _("<p>
To use suggested remote repositories during installation or update, select
-<b>Add Online Repositories Before Installation</b>.</p>
-"):"") +
+<b>Add Online Repositories Before Installation</b>.</p>"):"") +
// help text for installation method
_("<p>
To install an add-on product from separate media together with &product;,
select
-<b>Include Add-On Products from Separate Media</b>.</p>
-") +
+<b>Include Add-On Products from Separate Media</b>.</p>") +
// help text for installation method
_("<p>
-To let new installation create an automatic configuration, select
-<b>Use Automatic Configuration</b>. Otherwise second stage installation
-with configuration proposals will be called instead. Update mode does not
-support automatic configuration.</p>
-") +
+To let the new installation to create an automatic configuration, select
+<b>Use Automatic Configuration</b>. Otherwise, second stage installation
+with configuration proposals will be used. Update mode does not
+support automatic configuration.</p>") +
// help text for installation method
_("<p>Select <b>Repair Installed System</b> if you have a damaged Linux
system on
@@ -228,7 +229,7 @@
</p>") +
// help text for installation method
- _("<p>Features <b>Update</b> and <b>Repair Installed System</b> are only
+ _("<p>The features <b>Update</b> and <b>Repair Installed System</b> are
only
available if some Linux system has been detected.
</p>");
}
@@ -405,11 +406,9 @@
// %2 - logfile, possibly with errors
// %3 - link to our bugzilla
// %4 - directory where YaST logs are stored
- sformat (_("Calling the YaST module %1 has failed.
-More information can be found near the end of the '%2' file.
-
-This is worth reporting a bug at %3.
-Please, attach also all YaST logs stored in the '%4' directory."),
+ sformat (_("Accessing the YaST module %1 has failed.
+More information can be found in the '%2' file.
+Please report this bug at %3 and attach the YaST logs stored in the '%4'
directory."),
"inst_repair",
"/var/log/YaST2/y2log",
"http://bugzilla.novell.com/";,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_network_check.ycp
new/yast2-installation-2.16.28/src/clients/inst_network_check.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_network_check.ycp
2007-12-03 16:14:57.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_network_check.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -74,12 +74,13 @@
`Empty()
),
`Left (`Label (_("No network setup has been found.
-It is vitally important for using remote repositories
-otherwise you can safely skip it.")))
+It is important if using remote repositories,
+otherwise you can safely skip it.
+")))
),
`VSpacing (2),
// TRANSLATORS: dialog label
- `Left(`Label (_("Would you like to configure your
network card now?"))),
+ `Left(`Label (_("Configure your network card now?"))),
`VSpacing (1),
`Frame (
// TRANSLATORS: frame label
@@ -98,12 +99,13 @@
`VStretch()
),
// TRANSLATORS: help text, part 1/2
- _("<p>The current installation system does not seem
-to have configured network.</p>") +
+ _("<p>The current installation system does not
+have a configured network.</p>
+") +
// TRANSLATORS: help text, part 2/2
_("<p>A configured network is needed for using remote repositories
-or Add-On products. You do not need to set it up in case you do not want
-to use any remote repository and you can skip the configuration then.</p>"),
+or add-on products. If you do not use remote repositories, skip the
configuratio.</p>
+"),
enable_next,
enable_back
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_network_setup.ycp
new/yast2-installation-2.16.28/src/clients/inst_network_setup.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_network_setup.ycp
2008-01-10 10:34:28.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_network_setup.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -173,7 +173,7 @@
`Label (_("Probing network cards..."))
),
// TRANSLATORS: dialog help
- _("Please wait while installation is probing the network cards..."),
+ _("Please wait while the installation is probing the network
cards..."),
false,
false
);
@@ -275,8 +275,7 @@
// TRANSLATORS: pop-up error message
Report::Error (_("No network card has been selected.
-First, you need to select one network card
-to configure it later."));
+Please select a network card to configure it later."));
return false;
// Checking whether the netcard link is active
@@ -287,10 +286,9 @@
sformat (
// TRANSLATORS: popup dialog question
// %1 is replaced with a network device string
- _("Link of the selected interface %1 is disconnected.
+ _("The link of the selected interface %1 is disconnected.
It needs to be connected for a proper network configuration.
-
-Are you sure you want to use it despite the given fact?"),
+Are you sure you want to use it?"),
selected_netcard
),
// TRANSLATORS: popup dialog button
@@ -343,12 +341,12 @@
// TRANSLATORS: dialog help 1/3
_("<p>Here you can configure your network cards to be used
immediately.</p>") +
// TRANSLATORS: dialog help 2/3
- _("<p>If you don't need a network connection now,
+ _("<p>If you do not need a network connection now,
you can safely skip the configuration.</p>") +
// TRANSLATORS: dialog help 3/3
- _("<p>To configure a network card, select it from list
-and click on the <b>Next</b> button,
-otherwise click on the <b>Cancel</b> button.</p>"),
+ _("<p>To configure a network card, select it from the list
+and click the <b>Next</b> button.
+Otherwise,click<b>Cancel</b>.</p>"),
Label::BackButton(),
Label::NextButton()
);
@@ -1143,14 +1141,13 @@
// TRANSLATORS: a pop-up dialog headline
_("Internet Test Failed"),
// TRANSLATORS: a pop-up dialog question, see buttons *3
- _("Because the Internet connection test failed, you should be
+ _("The Internet connection test failed. You should be
redirected to the previous dialog to change the configuration.
-
-Would you like to go back to change it?"),
+Go back and change it?"),
// TRANSLATORS: popup dialog button (*3)
_("Go Back"),
// TRANSLATORS: popup dialog button (*3)
- _("Skip It"),
+ _("Skip"),
`yes
)) {
return false;
@@ -1385,9 +1382,8 @@
if (all_ok != true) {
y2warning ("Writing has failed, returning to the previous dialog");
Report::Error (_("Writing the network settings failed.
-
-You will be returned to the previous dialog either
-to change the settings or to cancel the network setup."));
+You will be returned to the previous dialog to either
+change the settings, or cancel the network setup."));
return `back;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp
new/yast2-installation-2.16.28/src/clients/inst_software_selection.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp
2008-03-27 16:34:20.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_software_selection.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -179,8 +179,7 @@
break;
}
Popup::Message (_("No system type was selected.
-
-Select the default one, please."));
+Select the default type."));
continue;
} else if (ret == `abort || ret == `cancel) {
if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp
new/yast2-installation-2.16.28/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp
2008-03-19 17:26:58.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/inst_upgrade_urls.ycp
2008-04-01 10:34:40.000000000 +0200
@@ -102,7 +102,7 @@
// TRANSLATORS: dialog text, possibly multiline,
// Please, do not use more than 50 characters per line.
`Left (`Label (_("These repositories were found on the system
-you are just upgrading:"))),
+you are upgrading:"))),
`Table (
`id ("table_of_repos"),
`opt (`notify),
@@ -126,9 +126,8 @@
)
),
// TRANSLATORS: help text 1/3
- _("<p>Here you can see all software repositories that were found
-on the system you are just upgrading. You have better enable
-those you want to include in the upgrade process.</p>") +
+ _("<p>Here you see all software repositories found
+on the system you are upgrading. Enable the ones you want to include in the
upgrade process.</p>") +
// TRANSLATORS: help text 2/3
_("<p>To enable or disable an URL, click on the
<b>Toggle Status</b> button or double-click on the respective table
item.</p>") +
@@ -412,9 +411,8 @@
// TRANSLATORS: popup header
_("Network is not Configured"),
// TRANSLATORS: popup question
- _("Remote repositories require the Internet connection.
-
-Would you like to configure it?"),
+ _("Remote repositories require an Internet connection.
+Configure it?"),
Label::YesButton(),
Label::NoButton(),
`yes
@@ -570,7 +568,7 @@
Report::Error (sformat (
// TRANSLATORS: error report
// %1 is replaced with repo-name, %2 with repo-URL
- _("An error occurred when refreshing repository
+ _("An error occurred while refreshing repository
Name: %1
URL: %2"),
repo_name,
@@ -666,7 +664,7 @@
_("Initializing package manager..."),
],
// TRANSLATORS: dialog help
- _("<p>Please wait, while repositories are being read...</p>")
+ _("<p>Please wait while repositories are being read...</p>")
);
Wizard::SetTitleIcon ("yast-sw_source");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/ldconfig_finish.ycp
new/yast2-installation-2.16.28/src/clients/ldconfig_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/ldconfig_finish.ycp
2007-05-18 10:44:04.000000000 +0200
+++ new/yast2-installation-2.16.28/src/clients/ldconfig_finish.ycp
2008-04-01 13:11:10.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: ldconfig_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: ldconfig_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $
*
*/
@@ -37,7 +37,7 @@
"steps" : 1,
// progress step title
"title" : _("Setting up linker cache"),
- "when" : [ `installation, `update, `autoinst ],
+ "when" : [ `installation, `live_installation, `update, `autoinst ],
];
}
else if (func == "Write")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/switch_scr_finish.ycp
new/yast2-installation-2.16.28/src/clients/switch_scr_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/switch_scr_finish.ycp
2007-07-18 10:36:12.000000000 +0200
+++ new/yast2-installation-2.16.28/src/clients/switch_scr_finish.ycp
2008-04-01 13:11:10.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: switch_scr_finish.ycp 39488 2007-07-18 08:36:11Z locilka $
+ * $Id: switch_scr_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $
*
*/
@@ -69,7 +69,7 @@
"steps" : 1,
// progress step title
"title" : _("Moving to installed system..."),
- "when" : [ `installation, `update, `autoinst ],
+ "when" : [ `installation, `live_installation, `update, `autoinst ],
];
}
else if (func == "Write")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/clients/umount_finish.ycp
new/yast2-installation-2.16.28/src/clients/umount_finish.ycp
--- old/yast2-installation-2.16.27/src/clients/umount_finish.ycp
2008-03-03 13:26:34.000000000 +0100
+++ new/yast2-installation-2.16.28/src/clients/umount_finish.ycp
2008-04-01 13:11:10.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: umount_finish.ycp 44265 2008-02-08 09:37:51Z locilka $
+ * $Id: umount_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $
*
*/
@@ -44,7 +44,7 @@
"steps" : 1,
// progress step title
"title" : _("Unmounting all mounted devices..."),
- "when" : [ `installation, `update, `autoinst ],
+ "when" : [ `installation, `live_installation, `update, `autoinst ],
];
}
else if (func == "Write")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/include/inst_inc_first.ycp
new/yast2-installation-2.16.28/src/include/inst_inc_first.ycp
--- old/yast2-installation-2.16.27/src/include/inst_inc_first.ycp
2008-03-28 10:02:19.000000000 +0100
+++ new/yast2-installation-2.16.28/src/include/inst_inc_first.ycp
2008-04-01 12:55:05.000000000 +0200
@@ -21,6 +21,9 @@
import "FileUtils";
import "String";
import "Mode";
+ import "ProductFeatures";
+
+ include "installation/misc.ycp";
void InitMouse () {
if (!Arch::s390 () || Arch::board_iseries ()) {
@@ -43,8 +46,16 @@
ProductControl::DisableModule ("add-on");
ProductControl::DisableModule ("productsources");
+ // FATE #303396, Make second stage non-interactive
+ boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature
("globals", "enable_autoconfiguration");
+ boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature
("globals", "autoconfiguration_default");
+
// Enabled only when AC is selected
- ProductControl::DisableModule ("automatic_configuration");
+ InstData::enable_autoconfiguration = (enable_autoconfiguration == true);
+ // Default state
+ 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");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/include/misc.ycp
new/yast2-installation-2.16.28/src/include/misc.ycp
--- old/yast2-installation-2.16.27/src/include/misc.ycp 2008-03-28
13:37:21.000000000 +0100
+++ new/yast2-installation-2.16.28/src/include/misc.ycp 2008-04-01
13:13:48.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: misc.ycp 45831 2008-03-28 12:37:20Z locilka $
+ * $Id: misc.ycp 45927 2008-04-01 11:13:47Z locilka $
*
*/
@@ -208,7 +208,7 @@
return ( button == `confirm );
}
- void AdjustStepsAccordingToInstallationSettings () {
+ void AdjustAutomaticInstallation () {
if (ProductControl::GetUseAutomaticConfiguration()) {
ProductControl::DisableAllModulesAndProposals ("installation",
"continue");
ProductControl::EnableModule ("automatic_configuration");
@@ -216,6 +216,10 @@
ProductControl::UnDisableAllModulesAndProposals ("installation",
"continue");
ProductControl::DisableModule ("automatic_configuration");
}
+ }
+
+ void AdjustStepsAccordingToInstallationSettings () {
+ AdjustAutomaticInstallation();
if (Installation::add_on_selected == true) {
ProductControl::EnableModule ("add-on");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp
new/yast2-installation-2.16.28/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp
2008-03-28 14:22:11.000000000 +0100
+++ new/yast2-installation-2.16.28/src/modules/ImageInstallation.ycp
2008-04-01 15:48:12.000000000 +0200
@@ -312,6 +312,42 @@
// TODO error checking
}
+// TODO: extract the weight from control file
+list <string> patterns_priority = ["^kde", "^gnome", "^xfce", "^x11", "^base",
"^enhanced_base"];
+
+/**
+ * Function finds a pattern weight
+ * The return value is 0 to 9999. The smaller the number the bigger the weight.
+ *
+ * @param string pattern
+ * @return integer pattern weight
+ */
+integer GetPatternWeight (string pattern) {
+ integer weight = 9999;
+
+ integer counter = -1;
+ foreach (string one_pattern_regexp, patterns_priority, {
+ counter = counter + 1;
+ if (regexpmatch (pattern, one_pattern_regexp)) {
+ weight = counter;
+ break;
+ }
+ });
+
+ return weight;
+}
+
+/**
+ * Patterns have an internal weight. It says which one of two is better
+ * to use for image installation. The size does matter.
+ */
+boolean DoesPatternFitBetter (string last_pattern, string new_pattern) {
+ integer last_pattern_weight = GetPatternWeight (last_pattern);
+ integer new_pattern_weight = GetPatternWeight (new_pattern);
+
+ return (new_pattern_weight < last_pattern_weight);
+}
+
/**
* Find a set of images which suites selected patterns
* @param patterns a list of patterns which are selected
@@ -345,16 +381,52 @@
y2milestone ("Image set descriptions: %1", image_sets);
map<string,any> result = $[];
+ // more patterns could match at once
+ // as we can't merge the meta image, only one can be selected
+ map <string, map <string, any> > possible_patterns = $[];
+ map <string, integer> matching_pattern_sizes = $[];
+
+ // trying to find all matching patterns
foreach (map<string,any> image, image_sets, {
string pattern = image["pattern"]:"";
+ // no image-pattern defined, matches all patterns
if (pattern == "" && result == $[]) {
- result = image;
+ possible_patterns[pattern] = image;
+ // image-patterns matches to patterns got as parameter
} else if (contains (patterns, pattern)) {
- result = image;
+ possible_patterns[pattern] = image;
}
+
+ matching_pattern_sizes[pattern] = size (image);
});
+ y2milestone ("Matching patterns: %1, sizes: %2", possible_patterns,
matching_pattern_sizes);
+
+ string last_pattern = "";
+
+ // one result
+ if (size (possible_patterns) == 1) {
+ foreach (string pattern, map <string, any> image, possible_patterns, {
+ result = image;
+ last_pattern = pattern;
+ });
+ // more possible results
+ } else if (size (possible_patterns) > 1) {
+ integer last_size = -1;
+ last_pattern = "";
+
+ foreach (string pattern, map <string, any> image, possible_patterns, {
+ if (matching_pattern_sizes[pattern]:0 > last_size &&
DoesPatternFitBetter (last_pattern, pattern)) {
+ last_size = matching_pattern_sizes[pattern]:0;
+ result = image;
+ last_pattern = pattern;
+ }
+ });
+ }
+
+ y2milestone ("Result: %1/%2", last_pattern, result);
+
if (result == $[])
{
Installation::image_installation = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/src/modules/InstData.ycp
new/yast2-installation-2.16.28/src/modules/InstData.ycp
--- old/yast2-installation-2.16.27/src/modules/InstData.ycp 2008-03-14
10:36:45.000000000 +0100
+++ new/yast2-installation-2.16.28/src/modules/InstData.ycp 2008-04-01
12:53:08.000000000 +0200
@@ -48,6 +48,10 @@
global list <string> localDisabledModules = [];
global list <string> localDisabledProposals = [];
+ // FATE #303396, Non-interactive second stage
+ // this variable enables a check box in dialog
+ global boolean enable_autoconfiguration = false;
+
// <-- other
/* EOF */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.16.27/VERSION new/yast2-installation-2.16.28/VERSION
--- old/yast2-installation-2.16.27/VERSION 2008-03-28 14:30:31.000000000
+0100
+++ new/yast2-installation-2.16.28/VERSION 2008-04-01 17:25:45.000000000
+0200
@@ -1 +1 @@
-2.16.27
+2.16.28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |