Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Oct 19 13:19:05 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-10-16 15:06:00.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-10-18 16:21:25.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Oct 18 16:13:12 CEST 2006 - locilka@suse.cz
+
+- Added a life-belt into the second stage installation. It can be
+ restarted under these circumstances:
+
+ 1.) User aborts the installation
+ 2.) Installation process is killed during the installation
+ 3.) Computer is restarted during the installation (reset)
+
+ The very next time the system is restarted. YaST starts and
+ informs user that the previous installation was aborted/failed.
+ Then users are asked whether they want to rerun the second stage
+ installation (FATE #300422).
+
+- Fixed setting own Y2MAXLOGSIZE up in order to save memory
+ requirements during the first stage installation.
+- 2.14.3
+
+-------------------------------------------------------------------
Old:
----
inst.tgz
yast2-installation-2.14.2.tar.bz2
New:
----
yast2-installation-2.14.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.SXoCVt/_old 2006-10-19 13:17:18.000000000 +0200
+++ /var/tmp/diff_new_pack.SXoCVt/_new 2006-10-19 13:17:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.2)
+# spec file for package yast2-installation (Version 2.14.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.14.2
+Version: 2.14.3
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.2.tar.bz2
+Source0: yast2-installation-2.14.3.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: yast2-slp yast2-firewall
@@ -26,8 +26,8 @@
Requires: yast2-packager >= 2.13.152
# Pkg::ResolvableCountPatches
Requires: yast2-pkg-bindings >= 2.13.92
-# Linuxrc::display_ip
-Requires: yast2 >= 2.13.67
+# ProductControl::Run returning `abort (FATE #300422)
+Requires: yast2 >= 2.14.6
# Languages:GetLanguagesMap, bugzilla #204791
Requires: yast2-country >= 2.13.35
Requires: yast2-network yast2-users
@@ -68,7 +68,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.14.2
+%setup -n yast2-installation-2.14.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -131,6 +131,19 @@
%endif
%changelog -n yast2-installation
+* Wed Oct 18 2006 - locilka@suse.cz
+- Added a life-belt into the second stage installation. It can be
+ restarted under these circumstances:
+ 1.) User aborts the installation
+ 2.) Installation process is killed during the installation
+ 3.) Computer is restarted during the installation (reset)
+ The very next time the system is restarted. YaST starts and
+ informs user that the previous installation was aborted/failed.
+ Then users are asked whether they want to rerun the second stage
+ installation (FATE #300422).
+- Fixed setting own Y2MAXLOGSIZE up in order to save memory
+ requirements during the first stage installation.
+- 2.14.3
* Mon Oct 16 2006 - locilka@suse.cz
- Timeout license in AutoYaST after 2 seconds (#206706).
This solution doesn't break ncurses.
++++++ yast2-installation-2.14.2.tar.bz2 -> yast2-installation-2.14.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.2/VERSION new/yast2-installation-2.14.3/VERSION
--- old/yast2-installation-2.14.2/VERSION 2006-10-16 10:09:57.000000000 +0200
+++ new/yast2-installation-2.14.3/VERSION 2006-10-18 15:53:56.000000000 +0200
@@ -1 +1 @@
-2.14.2
+2.14.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.2/configure new/yast2-installation-2.14.3/configure
--- old/yast2-installation-2.14.2/configure 2006-10-16 15:05:11.000000000 +0200
+++ new/yast2-installation-2.14.3/configure 2006-10-18 16:25:17.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.14.2.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.14.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.14.2'
-PACKAGE_STRING='yast2-installation 2.14.2'
+PACKAGE_VERSION='2.14.3'
+PACKAGE_STRING='yast2-installation 2.14.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-installation 2.14.2 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.14.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.14.2:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.14.3:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.14.2
+yast2-installation configure 2.14.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-installation $as_me 2.14.2, which was
+It was created by yast2-installation $as_me 2.14.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.14.2'
+ VERSION='2.14.3'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -2933,7 +2933,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.14.2, which was
+This file was extended by yast2-installation $as_me 2.14.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2988,7 +2988,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.14.2
+yast2-installation config.status 2.14.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.2/configure.in new/yast2-installation-2.14.3/configure.in
--- old/yast2-installation-2.14.2/configure.in 2006-10-16 15:05:05.000000000 +0200
+++ new/yast2-installation-2.14.3/configure.in 2006-10-18 16:25:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.14.2, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.3, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.2/src/clients/installation_worker.ycp new/yast2-installation-2.14.3/src/clients/installation_worker.ycp
--- old/yast2-installation-2.14.2/src/clients/installation_worker.ycp 2006-10-10 12:45:51.000000000 +0200
+++ new/yast2-installation-2.14.3/src/clients/installation_worker.ycp 2006-10-18 14:24:59.000000000 +0200
@@ -91,6 +91,50 @@
UI::RecordMacro( Directory::logdir + "/macro_inst_initial.ycp" );
}
+ string file_inst_aborted = "/var/lib/YaST2/second_stage_aborted";
+ string file_inst_failed = "/var/lib/YaST2/second_stage_failed";
+ string run_yast_at_boot = "/var/lib/YaST2/runme_at_boot";
+ string current_step = "/var/lib/YaST2/step";
+
+ // Second stage
+ // FATE #300422
+ if (Stage::cont ()) {
+ // Second stage installation bas been aborted or has failed
+ if (FileUtils::Exists (file_inst_aborted) || FileUtils::Exists (file_inst_failed)) {
+ // popup question (#x1)
+ string show_error = _("The previous installation has failed.\nWould you like to start it again?");
+ if (FileUtils::Exists (file_inst_aborted)) {
+ // popup question (#x1)
+ show_error = _("The previous installation has been aborted.\nWould you like to start it again?");
+ y2milestone("Case: aborted");
+ } else {
+ y2milestone("Case: failed");
+ }
+
+ if (! Popup::YesNoHeadline (
+ // popup headline (#x1)
+ _("Starting Installation..."),
+ show_error
+ )) {
+ y2warning ("User didn't want to restart the second stage installation...");
+ if (FileUtils::Exists (file_inst_aborted)) SCR::Execute (.target.remove, file_inst_aborted);
+ if (FileUtils::Exists (file_inst_failed)) SCR::Execute (.target.remove, file_inst_failed);
+ if (FileUtils::Exists (run_yast_at_boot)) SCR::Execute (.target.remove, run_yast_at_boot);
+
+ // skipping the second stage
+ return `skipped;
+ }
+ }
+
+ // Second stage installation is starting just here
+
+ // creating files in case the installation fails
+ // they are removed at the end if everything works well
+ y2milestone ("Creating files for case if installation fails (reset button)");
+ SCR::Execute (.target.bash, sformat ("touch %1", file_inst_failed));
+ SCR::Execute (.target.bash, sformat ("touch %1", run_yast_at_boot));
+ }
+
// Second stage
// Detect mode early to be able to setup steps correctly
if (Stage::cont () && FileUtils::Exists (Installation::destdir + "/var/lib/YaST2/update_mode"))
@@ -385,6 +429,8 @@
ret = ProductControl::Run();
}
+ y2milestone ("ProductControl::Run() returned %1", ret);
+
if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
{
integer last_step = ProductControl::CurrentStep ();
@@ -419,7 +465,8 @@
if (!Mode::test ())
WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe");
- if (Stage::cont () && ret != `reboot && ret != `restart_yast)
+ // when the installation is not aborted
+ if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `abort)
{
// remove /etc/install.inf, not needed any more
SCR::Execute (.target.remove, "/etc/install.inf");
@@ -428,16 +475,53 @@
SCR::Execute(.target.remove, "/var/lib/YaST2/update_mode");
SCR::Execute(.target.bash, "/bin/rm -rf /var/adm/current_package_descr");
}
- y2milestone("Removing /var/lib/YaST2/runme_at_boot");
- SCR::Execute(.target.remove, "/var/lib/YaST2/runme_at_boot");
+
+ if (FileUtils::Exists (run_yast_at_boot)) {
+ y2milestone("Removing %1", run_yast_at_boot);
+ SCR::Execute(.target.remove, run_yast_at_boot);
+ }
+
+ // This file says that the configuration has failed
+ // we don't need it anymore
+ // FATE #300422
+ if (FileUtils::Exists (file_inst_failed)) {
+ y2milestone ("Removing file %1", file_inst_failed);
+ SCR::Execute (.target.remove, file_inst_failed);
+ }
// This file has the current step of the workflow to be used
// for crash recovery during installation. It can be deleted when
// the installation has been completed.
- SCR::Execute(.target.remove, "/var/lib/YaST2/step");
+ if (FileUtils::Exists (current_step)) {
+ y2milestone ("Removing file %1", current_step);
+ SCR::Execute (.target.remove, current_step);
+ }
if (WFM::Read (.local.size, "/usr/share/YaST2/clients/product_post.ycp") > 0)
WFM::CallFunction ("product_post", [Mode::update ()]);
+
+ // installation (second stage) has been aborted
+ // FATE #300422
+ } else if (Stage::cont() && (ret == `abort || ret == `cancel)) {
+ // removing the current step information
+ // installation will be started from the very begining
+ if (FileUtils::Exists (current_step)) {
+ y2milestone ("Removing file %1", current_step);
+ SCR::Execute (.target.remove, current_step);
+ }
+
+ // not to be identified as failed but aborted
+ if (FileUtils::Exists (file_inst_failed)) {
+ y2milestone ("Removing file %1", file_inst_failed);
+ SCR::Execute (.target.remove, file_inst_failed);
+ }
+
+ // creating files saying that YaST will be started after reboot
+ // if they don't exist
+ y2warning ("Second Stage Installation has been aborted, creating files %1 and %2",
+ run_yast_at_boot, file_inst_aborted);
+ SCR::Execute (.target.bash, sformat ("touch %1", run_yast_at_boot));
+ SCR::Execute (.target.bash, sformat ("touch %1", file_inst_aborted));
}
// TRANSLATORS: busy message
@@ -448,5 +532,6 @@
UI::CloseDialog(); // #2
UI::CloseDialog();
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.2/startup/First-Stage/F08-logging new/yast2-installation-2.14.3/startup/First-Stage/F08-logging
--- old/yast2-installation-2.14.2/startup/First-Stage/F08-logging 2006-10-09 16:09:06.000000000 +0200
+++ new/yast2-installation-2.14.3/startup/First-Stage/F08-logging 2006-10-17 17:56:50.000000000 +0200
@@ -5,15 +5,23 @@
#=============================================
# 8) setup default logfile size
#---------------------------------------------
+
+# log size defined by user
+Y2MAXLOGSIZE_INITIAL=$Y2MAXLOGSIZE
+
test -z "$Y2MAXLOGSIZE" && export Y2MAXLOGSIZE=100
test -z "$Y2MAXLOGNUM" && export Y2MAXLOGNUM=5
#=============================================
# 8.1) setup logfile size as 1/3 of FreeRam
#---------------------------------------------
-USE=`awk '/^MemFree:/{ n=2 ; printf "%d\n", $n/3 }' /proc/meminfo`
-if [ "$USE" -gt "$Y2MAXLOGSIZE" ];then
- export Y2MAXLOGSIZE=$USE
+
+# log size not defined by user
+if [ "$Y2MAXLOGSIZE_INITIAL" == "" ]; then
+ USE=`awk '/^MemFree:/{ n=2 ; printf "%d\n", $n/3 }' /proc/meminfo`
+ if [ "$USE" -gt "$Y2MAXLOGSIZE" ];then
+ export Y2MAXLOGSIZE=$USE
+ fi
fi
#=============================================
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org