Hello community,
here is the log from the commit of package yast2-installation
checked in at Sat Apr 7 10:04:39 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-04-05 17:32:06.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-04-06 16:55:00.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 6 16:48:58 CEST 2007 - locilka@suse.cz
+
+- In case of reboot during installation, network services status
+ is stored to a reboot_network_settings file and their status
+ is restored again when starting the installation after reboot.
+ Restoring the status uses Progress library for user feedback
+ (#258742).
+- Adjusted RPM dependencies.
+- 2.15.18
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.17.tar.bz2
New:
----
yast2-installation-2.15.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.pT3352/_old 2007-04-07 10:04:25.000000000 +0200
+++ /var/tmp/diff_new_pack.pT3352/_new 2007-04-07 10:04:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.17)
+# spec file for package yast2-installation (Version 2.15.18)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,18 @@
# norootforbuild
Name: yast2-installation
-Version: 2.15.17
+Version: 2.15.18
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.17.tar.bz2
+Source0: yast2-installation-2.15.18.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
BuildRequires: yast2 >= 2.15.22
Requires: autoyast2-installation
-# WorkflowManager module
-Requires: yast2 >= 2.15.22
+# WorkflowManager module, Installation::reboot_net_settings
+Requires: yast2 >= 2.15.25
# Required in in the first stage, after
# switching to the installed system, bugzilla #249679
Requires: yast2-bootloader
@@ -83,7 +83,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.17
+%setup -n yast2-installation-2.15.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -146,6 +146,14 @@
%endif
%changelog
+* Fri Apr 06 2007 - locilka@suse.cz
+- In case of reboot during installation, network services status
+ is stored to a reboot_network_settings file and their status
+ is restored again when starting the installation after reboot.
+ Restoring the status uses Progress library for user feedback
+ (#258742).
+- Adjusted RPM dependencies.
+- 2.15.18
* Thu Apr 05 2007 - locilka@suse.cz
- Using function PackagesUI::ConfirmLicenses() instead of
maintaining own code with almost the same functionality (#256627)
++++++ yast2-installation-2.15.17.tar.bz2 -> yast2-installation-2.15.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/configure new/yast2-installation-2.15.18/configure
--- old/yast2-installation-2.15.17/configure 2007-02-22 15:13:57.000000000 +0100
+++ new/yast2-installation-2.15.18/configure 2007-04-06 17:00:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.9.
+# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.17.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.15.9'
-PACKAGE_STRING='yast2-installation 2.15.9'
+PACKAGE_VERSION='2.15.17'
+PACKAGE_STRING='yast2-installation 2.15.17'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1192,7 +1192,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.15.9 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.15.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1263,7 +1263,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.15.9:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.15.17:";;
esac
cat <<\_ACEOF
@@ -1341,7 +1341,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.15.9
+yast2-installation configure 2.15.17
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1355,7 +1355,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.15.9, which was
+It was created by yast2-installation $as_me 2.15.17, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2156,7 +2156,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.15.9'
+ VERSION='2.15.17'
cat >>confdefs.h <<_ACEOF
@@ -2383,7 +2383,7 @@
-VERSION="2.15.9"
+VERSION="2.15.17"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3512,7 +3512,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.15.9, which was
+This file was extended by yast2-installation $as_me 2.15.17, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3555,7 +3555,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.15.9
+yast2-installation config.status 2.15.17
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/configure.in new/yast2-installation-2.15.18/configure.in
--- old/yast2-installation-2.15.17/configure.in 2007-02-22 15:13:52.000000000 +0100
+++ new/yast2-installation-2.15.18/configure.in 2007-04-06 17:00:09.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.15.9, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.15.17, 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.15.9"
+VERSION="2.15.17"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/src/clients/inst_worker_continue.ycp new/yast2-installation-2.15.18/src/clients/inst_worker_continue.ycp
--- old/yast2-installation-2.15.17/src/clients/inst_worker_continue.ycp 2007-02-22 13:49:06.000000000 +0100
+++ new/yast2-installation-2.15.18/src/clients/inst_worker_continue.ycp 2007-04-06 16:11:08.000000000 +0200
@@ -56,6 +56,13 @@
UpdateWizardSteps ();
+ // Adjusts network services to the state in which they were
+ // before rebooting the installation (e.g., inst_you)
+ // bugzilla #258742
+ InitNetworkServices();
+ // Set "Initializing..." UI again
+ SetInitializingUI();
+
// Second stage
SetLanguageAndEncoding();
retranslateWizardDialog();
@@ -113,6 +120,11 @@
// tell linuxrc that we aborted
Linuxrc::WriteYaSTInf($["Aborted" : "1"]);
}
+
+ // Store network services to the state in which they are
+ // before rebooting the installation (e.g., inst_you)
+ // bugzilla #258742
+ StoreNetworkServices (ret);
// when the installation is not aborted or YaST is not restarted on purpose
// ret == `next -> (ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/src/include/inst_inc_all.ycp new/yast2-installation-2.15.18/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.15.17/src/include/inst_inc_all.ycp 2007-02-19 17:30:30.000000000 +0100
+++ new/yast2-installation-2.15.18/src/include/inst_inc_all.ycp 2007-04-06 16:10:27.000000000 +0200
@@ -19,10 +19,9 @@
import "Report";
import "Installation";
import "Stage";
+ import "Mode";
- void CreateUI () {
- Wizard::OpenNextBackStepsDialog();
-
+ void SetInitializingUI () {
Wizard::SetContents(
// dialog caption
_("Initializing..."),
@@ -35,6 +34,11 @@
Wizard::SetTitleIcon("yast-inst-mode");
}
+ void CreateUI () {
+ Wizard::OpenNextBackStepsDialog();
+ SetInitializingUI ();
+ }
+
void FinishInstallation () {
y2milestone("Finishing the installation...");
// TRANSLATORS: busy message
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/src/include/inst_inc_second.ycp new/yast2-installation-2.15.18/src/include/inst_inc_second.ycp
--- old/yast2-installation-2.15.17/src/include/inst_inc_second.ycp 2007-03-28 15:22:06.000000000 +0200
+++ new/yast2-installation-2.15.18/src/include/inst_inc_second.ycp 2007-04-06 16:39:58.000000000 +0200
@@ -21,6 +21,125 @@
import "ProductControl";
import "Console";
import "Keyboard";
+ import "Service";
+ import "Progress";
+ import "Wizard";
+
+ // The order of services is important
+ // especially for starting them
+ list <string> inst_network_services = ["network", "portmap", "SuSEfirewall2_setup"];
+
+ /**
+ * Stores the current status of network services into
+ * Installation::reboot_net_settings file
+ *
+ * @param symbol ret containing either `reboot or anything else
+ * @see inst_network_services for list of network services
+ */
+ void StoreNetworkServices (symbol ret) {
+ // Store the current status of services
+ // bugzilla #258742
+ if (ret == `reboot) {
+ map network_settings = $[];
+ foreach (string one_service, inst_network_services, {
+ network_settings[one_service] = (Service::Status (one_service) == 0);
+ });
+ y2milestone ("Storing services status: %1 into %2",
+ network_settings, Installation::reboot_net_settings
+ );
+ SCR::Write (.target.ycp, Installation::reboot_net_settings, network_settings);
+ } else {
+ if (FileUtils::Exists (Installation::reboot_net_settings))
+ SCR::Execute (.target.remove, Installation::reboot_net_settings);
+ }
+ }
+
+ void InitNetworkServices () {
+ y2milestone ("Initializing network services...");
+
+ // no settings stored
+ if (! FileUtils::Exists (Installation::reboot_net_settings)) {
+ y2milestone ("File %1 doesn't exist, skipping InitNetworkServices",
+ Installation::reboot_net_settings
+ );
+ return;
+ }
+
+ map network_settings =
+ (map ) SCR::Read (.target.ycp, Installation::reboot_net_settings);
+ y2milestone ("Adjusting services: %1", network_settings);
+
+ // wrong syntax, wrong settings
+ if (network_settings == nil) {
+ y2error ("Cannot read stored network services %1",
+ SCR::Read (.target.string, Installation::reboot_net_settings)
+ );
+ return;
+ }
+
+ list <string> start_service = [];
+ list <string> starting_service = [];
+
+ // leave just services to be enabled
+ // that are not running yet and that also exist
+ network_settings = filter (string one_service, boolean new_status, network_settings, {
+ if (new_status != true) {
+ y2milestone ("Service %1 needn't be started", one_service);
+ return false;
+ }
+
+ integer service_status = Service::Status (one_service);
+
+ // 0 means running
+ if (service_status == 0) {
+ y2milestone ("Service %1 is already running", one_service);
+ return false;
+ }
+
+ // -1 means unknown (which might be correct, package needn't be installed)
+ if (service_status == -1) {
+ y2warning ("Service %1 is unknown", one_service);
+ return false;
+ }
+
+ // TRANSLATORS: progress stage, %1 stands for service name
+ start_service = add (start_service, sformat(_("Start service %1"), one_service));
+ // TRANSLATORS: progress stage, %1 stands for service name
+ starting_service = add (starting_service, sformat (_("Starting service %1..."), one_service));
+
+ return true;
+ });
+
+ if (size (network_settings) == 0 || network_settings == nil) {
+ y2milestone ("Nothing to adjust, leaving... %1", network_settings);
+ return;
+ }
+
+ Progress::New (
+ // TRANSLATORS: dialog caption
+ _("Adjusting Network Settings"),
+ " ",
+ size (network_settings),
+ start_service,
+ starting_service,
+ // TRANSLATORS: dialog help
+ _("Please wait while network settings are being adjusted...")
+ );
+ Wizard::SetTitleIcon ("yast-network");
+
+ Progress::NextStage ();
+
+ // Adjusting services
+ foreach (string one_service, boolean new_status, network_settings, {
+ boolean ret = Service::Start (one_service);
+ y2milestone ("Starting service %1 returned %2", one_service, ret);
+
+ Progress::NextStage ();
+ });
+
+ Progress::Finish ();
+ y2milestone ("All network services have been adjusted");
+ }
void SetUpdateLanguage () {
string var_file = Directory::vardir + "/language.ycp";
@@ -202,7 +321,7 @@
SCR::Execute (.target.bash, sformat (
"touch %1", Installation::restart_file));
}
-
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.17/VERSION new/yast2-installation-2.15.18/VERSION
--- old/yast2-installation-2.15.17/VERSION 2007-04-05 17:31:56.000000000 +0200
+++ new/yast2-installation-2.15.18/VERSION 2007-04-06 17:01:45.000000000 +0200
@@ -1 +1 @@
-2.15.17
+2.15.18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org