Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Mar 5 15:45:40 CET 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-02-22 15:12:27.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-03-05 13:14:26.000000000 +0100
@@ -1,0 +2,30 @@
+Mon Mar 5 12:58:21 CET 2007 - locilka@suse.cz
+
+- Adding new installation client mouse_finish which is called
+ before SCR is switched. This removes the dependency of
+ yast2-installation on yast2-mouse.
+- 2.15.11
+
+-------------------------------------------------------------------
+Fri Mar 2 15:27:14 CET 2007 - locilka@suse.cz
+
+- Providing feedback (busy message) in inst_restore_settings.
+ Starting network by calling 'network start' with timeout.
+- Adding yast2-bootloader into required packages because it is
+ needed after the SCR is switched into the installed system just
+ before reboot (#249679).
+- Added more logging into inst_system_analysis (booting installed
+ system).
+- 2.15.10
+
+-------------------------------------------------------------------
+Wed Feb 28 14:11:16 CET 2007 - jsrain@suse.cz
+
+- added more logging to umount_finish (#247594)
+
+-------------------------------------------------------------------
+Mon Feb 26 16:03:42 CET 2007 - jsrain@suse.cz
+
+- updated popup in case of license is not accepted (#162499)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.9.tar.bz2
New:
----
yast2-installation-2.15.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.mB2270/_old 2007-03-05 15:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.mB2270/_new 2007-03-05 15:44:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.9)
+# spec file for package yast2-installation (Version 2.15.11)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,19 @@
# norootforbuild
Name: yast2-installation
-Version: 2.15.9
+Version: 2.15.11
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.9.tar.bz2
+Source0: yast2-installation-2.15.11.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
Requires: autoyast2-installation
Requires: yast2 >= 2.14.6
+# Required in in the first stage, after
+# switching to the installed system, bugzilla #249679
+Requires: yast2-bootloader
# Language::selection_skipped, bugzilla #223258
Requires: yast2-country >= 2.15.0
Requires: yast2-network
@@ -28,7 +31,6 @@
Requires: yast2-packager >= 2.15.7
# Only in inst-sys
# Requires: yast2-add-on
-# Requires: yast2-bootloader
# Requires: yast2-mouse
# Requires: yast2-storage
# Requires: yast2-update
@@ -79,7 +81,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.9
+%setup -n yast2-installation-2.15.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -142,6 +144,24 @@
%endif
%changelog
+* Mon Mar 05 2007 - locilka@suse.cz
+- Adding new installation client mouse_finish which is called
+ before SCR is switched. This removes the dependency of
+ yast2-installation on yast2-mouse.
+- 2.15.11
+* Fri Mar 02 2007 - locilka@suse.cz
+- Providing feedback (busy message) in inst_restore_settings.
+ Starting network by calling 'network start' with timeout.
+- Adding yast2-bootloader into required packages because it is
+ needed after the SCR is switched into the installed system just
+ before reboot (#249679).
+- Added more logging into inst_system_analysis (booting installed
+ system).
+- 2.15.10
+* Wed Feb 28 2007 - jsrain@suse.cz
+- added more logging to umount_finish (#247594)
+* Mon Feb 26 2007 - jsrain@suse.cz
+- updated popup in case of license is not accepted (#162499)
* Thu Feb 22 2007 - locilka@suse.cz
- Splitting installation_worker (main installation script) into
inst_worker_initial and inst_worker_continue.
++++++ yast2-installation-2.15.9.tar.bz2 -> yast2-installation-2.15.11.tar.bz2 ++++++
++++ 2040 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.15.9/src/clients/inst_finish.ycp new/yast2-installation-2.15.11/src/clients/inst_finish.ycp
--- old/yast2-installation-2.15.9/src/clients/inst_finish.ycp 2007-02-20 16:34:58.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/inst_finish.ycp 2007-03-05 15:17:58.000000000 +0100
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 36324 2007-02-20 15:34:56Z locilka $
+ * $Id: inst_finish.ycp 36694 2007-03-05 14:17:54Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -41,6 +41,7 @@
"label" : _("Copy files to installed system"),
"steps" : [
"autoinst_scripts1",
+ "mouse",
"copy_files",
"copy_systemfiles",
"switch_scr",
@@ -87,9 +88,11 @@
"label" : _("Prepare system for initial boot"),
"steps" : [
"vm",
- "copy_logs",
"driver_update2",
"pre_umount",
+ // copy logs just before 'umount'
+ // keeps maximum logs available after reboot
+ "copy_logs",
"umount",
],
],
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.15.9/src/clients/inst_restore_settings.ycp new/yast2-installation-2.15.11/src/clients/inst_restore_settings.ycp
--- old/yast2-installation-2.15.9/src/clients/inst_restore_settings.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/inst_restore_settings.ycp 2007-03-02 15:26:42.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Restore settings after restart during 2nd-stage installation
* Authors: Anas Nashif
*
- * $Id: inst_restore_settings.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: inst_restore_settings.ycp 36659 2007-03-02 14:26:39Z locilka $
*
*/
@@ -23,7 +23,13 @@
foreach (string service, ["network"], {
if (Service::Enabled (service) && Service::Status (service) != 0)
{
- Service::Start (service);
+ // TRANSLATORS: busy message
+ UI::OpenDialog (`Label(_("Starting network services..."), service));
+
+ // This might take a lot of time if case of DHCP, for instance
+ Service::RunInitScriptWithTimeOut (service, "start");
+
+ UI::CloseDialog();
}
});
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.15.9/src/clients/inst_system_analysis.ycp new/yast2-installation-2.15.11/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.15.9/src/clients/inst_system_analysis.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/inst_system_analysis.ycp 2007-03-02 15:57:12.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
*
- * $Id: inst_system_analysis.ycp 33978 2006-11-01 17:43:03Z locilka $
+ * $Id: inst_system_analysis.ycp 36670 2007-03-02 14:57:10Z locilka $
*
*/
@@ -62,15 +62,18 @@
if (RootPart::numberOfValidRootPartitions == 1)
{
+ y2milestone ("Only one partition with system...");
RootPart::SetSelectedToValid ();
}
else
{
+ y2milestone ("More partitions with system...");
if (WFM::CallFunction ("inst_rootpart", [true, true, `boot_popup]) != `next)
return `cancel;
}
string root_part = RootPart::selectedRootPartition;
+ y2milestone ("Trying to boot from %1 partitions", root_part);
UI::OpenDialog( `opt(`decorated),
// Information popup: Inform user what partition
@@ -362,7 +365,10 @@
// Boot was selected
if (new_mode == `boot) {
- if (handle_boot() != `finish) {
+ symbol ret = handle_boot();
+ y2milestone ("handle_boot() returned '%1'", ret);
+
+ if (ret != `finish) {
y2milestone("Not booting any OS");
ret = nil;
continue;
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.15.9/src/clients/mouse_finish.ycp new/yast2-installation-2.15.11/src/clients/mouse_finish.ycp
--- old/yast2-installation-2.15.9/src/clients/mouse_finish.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/mouse_finish.ycp 2007-03-05 15:17:24.000000000 +0100
@@ -0,0 +1,110 @@
+/**
+ * File:
+ * mouse_finish.ycp
+ *
+ * Module:
+ * Step of base installation finish
+ *
+ * Authors:
+ * Lukas Ocilka
+ *
+ * $Id:$
+ *
+ */
+
+{
+
+// This client exists because yast2-installation package
+// needn't installed yast2-mouse anymore
+//
+// SCR::Write is called before SCR is switched to the installed system
+
+textdomain "installation";
+
+import "Progress";
+import "Installation";
+import "Mouse";
+import "FileUtils";
+import "String";
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map)WFM::Args(1);
+}
+
+y2milestone ("starting mouse_finish");
+y2debug("func=%1", func);
+y2debug("param=%1", param);
+
+if (func == "Info")
+{
+ return (any)$[
+ "steps" : 1,
+ "when" : [ `installation, `update, `autoinst ],
+ ];
+}
+else if (func == "Write")
+{
+ string sysconfigdir = "/etc/sysconfig/";
+ string sysconfigfile = "/etc/sysconfig/mouse";
+
+ // Create local sysconfig directory
+ SCR::Execute (.target.mkdir, sysconfigdir);
+ if (! FileUtils::Exists (sysconfigdir)) {
+ y2error ("Directory %1 does not exist!", sysconfigdir);
+ }
+
+ // Copy file from installed system if already exists
+ if (FileUtils::Exists (Installation::destdir + sysconfigfile)) {
+ y2milestone ("copy %1 -> %2", Installation::destdir + sysconfigfile, sysconfigfile);
+ SCR::Execute (.target.bash, sformat ("cp '%1' '%2'",
+ String::Quote (Installation::destdir + sysconfigfile),
+ String::Quote (sysconfigfile)
+ ));
+ }
+
+ // Create mouse sysconfig file if does not exist
+ if (! FileUtils::Exists (sysconfigfile)) {
+ y2milestone ("Create %1", sysconfigfile);
+ SCR::Execute (.target.bash, sformat ("touch '%1'", String::Quote (sysconfigfile)));
+ }
+
+ // progress step title
+ Progress::Title (_("Saving mouse configuration..."));
+ // Save the configuration
+ ret = Mouse::Save();
+ Progress::NextStep ();
+
+ // Copy to the installed system
+ y2milestone ("Copy %1 -> %2", sysconfigfile, Installation::destdir + sysconfigfile);
+ map cmd = (map) SCR::Execute (.target.bash_output, sformat (
+ "cp '%1' '%2'",
+ String::Quote (sysconfigfile),
+ String::Quote (Installation::destdir + sysconfigfile)
+ ));
+
+ if (cmd["exit"]:-1 != 0) {
+ y2error ("Cannot copy '%1' to '%2': %3", sysconfigfile, Installation::destdir + sysconfigfile, cmd);
+ ret = false;
+ } else {
+ ret = true;
+ }
+}
+else
+{
+ y2error ("unknown function: %1", func);
+ ret = nil;
+}
+
+y2debug("ret=%1", ret);
+y2milestone("mouse_finish finished");
+return ret;
+
+
+} /* 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.15.9/src/clients/pre_umount_finish.ycp new/yast2-installation-2.15.11/src/clients/pre_umount_finish.ycp
--- old/yast2-installation-2.15.9/src/clients/pre_umount_finish.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/pre_umount_finish.ycp 2007-03-05 14:26:32.000000000 +0100
@@ -43,6 +43,7 @@
else if (func == "Write")
{
if (size (Misc::boot_msg) > 0) {
+ // just a beep
SCR::Execute (.target.bash, "/bin/echo -e '\a'");
}
}
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.15.9/src/clients/save_config_finish.ycp new/yast2-installation-2.15.11/src/clients/save_config_finish.ycp
--- old/yast2-installation-2.15.9/src/clients/save_config_finish.ycp 2007-02-05 11:32:37.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/save_config_finish.ycp 2007-03-05 15:17:58.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: save_config_finish.ycp 35849 2007-02-05 10:32:36Z locilka $
+ * $Id: save_config_finish.ycp 36694 2007-03-05 14:17:54Z locilka $
*
*/
@@ -18,7 +18,6 @@
import "Directory";
import "Mode";
-import "Mouse";
import "Timezone";
import "Language";
import "Keyboard";
@@ -50,7 +49,7 @@
if (func == "Info")
{
return (any)$[
- "steps" : Mode::autoinst () ? 8 : (Mode::update() ? 6 : 7),
+ "steps" : Mode::autoinst () ? 7 : (Mode::update() ? 5 : 6),
"when" : [ `installation, `update, `autoinst ],
];
}
@@ -89,10 +88,6 @@
}
// progress step title
- Progress::Title (_("Saving mouse configuration..."));
- Mouse::Save();
- Progress::NextStep ();
- // progress step title
Progress::Title (_("Saving time zone..."));
Timezone::Save();
Progress::NextStep ();
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.15.9/src/clients/umount_finish.ycp new/yast2-installation-2.15.11/src/clients/umount_finish.ycp
--- old/yast2-installation-2.15.9/src/clients/umount_finish.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.11/src/clients/umount_finish.ycp 2007-03-01 14:58:35.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: umount_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: umount_finish.ycp 36572 2007-02-28 13:13:55Z jsrain $
*
*/
@@ -49,6 +49,10 @@
{
// loop over all filesystems
map mountPoints = (map)Storage::GetMountPoints();
+ y2milestone ("Known mount points: %1", mountPoints);
+ y2milestone ("/proc/mounts:\n%1", WFM::Read (.local.string, "/proc/mounts"));
+ y2milestone ("/proc/partitions:\n%1", WFM::Read (.local.string, "/proc/partitions"));
+
list<string> umountList = [];
// go through mountPoints collecting paths in umountList
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.15.9/src/modules/ProductLicense.ycp new/yast2-installation-2.15.11/src/modules/ProductLicense.ycp
--- old/yast2-installation-2.15.9/src/modules/ProductLicense.ycp 2007-02-05 15:45:30.000000000 +0100
+++ new/yast2-installation-2.15.11/src/modules/ProductLicense.ycp 2007-03-01 14:58:35.000000000 +0100
@@ -382,7 +382,21 @@
// License declined
if (accept == `no)
{
- if (Popup::YesNo(_("Reread or reconsider the license agreement?")))
+ // message is void in case not accepting license doesn't stop the installation
+ if (action == "continue")
+ {
+ y2milestone ("action in case of license refusal is continue, not asking user");
+ return `accepted;
+ }
+ // text changed due to bug #162499
+ string refuse_popup_text = base_product
+ // text asking whether to refuse a license (Yes-No popup)
+ ? _("Refusing the license agreement cancels installation.
+Really refuse the agreement?")
+ // text asking whether to refuse a license (Yes-No popup)
+ : _("Refusing the license agreement cancels the add-on
+product installation. Really refuse the agreement?");
+ if (! Popup::YesNo(refuse_popup_text))
{
continue;
}
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.15.9/VERSION new/yast2-installation-2.15.11/VERSION
--- old/yast2-installation-2.15.9/VERSION 2007-02-22 14:24:41.000000000 +0100
+++ new/yast2-installation-2.15.11/VERSION 2007-03-05 13:03:56.000000000 +0100
@@ -1 +1 @@
-2.15.9
+2.15.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org