Mailinglist Archive: opensuse-commit (554 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 7 Dec 2006 19:56:47 +0100 (CET)
  • Message-id: <20061207185647.EC5591AA2C6@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Thu Dec 7 19:56:47 CET 2006.

--------
--- yast2-installation/yast2-installation.changes 2006-11-23 11:20:30.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-12-07 11:20:39.000000000 +0100
@@ -1,0 +2,33 @@
+Thu Dec 7 10:46:00 CET 2006 - locilka@xxxxxxx
+
+- Reworked adding and removing Add-Ons during the first stage
+ installation. If some Add-Ons are added or removed, the entire
+ workflow is created from scratch (#221377).
+- Using a separate temporary directory for Add-On licenses not to
+ be confused by the previous Add-On.
+- Fixed Second Stage Installation script to handle rebooting
+ after kernel-patch correctly (#224251).
+- Fixed Add-On handling when cancelling adding an Add-On product,
+ before that return value from the previous adding was evaluated.
+- Fixing some texts (#223880)
+- 2.15.1
+
+-------------------------------------------------------------------
+Mon Dec 4 16:27:21 CET 2006 - locilka@xxxxxxx
+
+- Adding support for own help texts for particular submodules in
+ installation proposal (FATE #301151). Use key "help" in
+ "MakeProposal"'s function result.
+- Adding root_password_ca_check item into the globals of control
+ file set to true for SLES and false otherwise (FATE #300438).
+- A better fix for disabling [Back] button in License Agreement
+ dialog when the previous (Language) dialog has been skipped
+ (223258).
+- 2.15.0
+
+-------------------------------------------------------------------
+Mon Dec 4 08:34:02 CET 2006 - lslezak@xxxxxxx
+
+- "en_EN" -> "en_GB" in list of the preferred languages for EULA
+
+-------------------------------------------------------------------

Old:
----
yast2-installation-2.14.15.tar.bz2

New:
----
yast2-installation-2.15.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.C3JhOp/_old 2006-12-07 19:56:10.000000000 +0100
+++ /var/tmp/diff_new_pack.C3JhOp/_new 2006-12-07 19:56:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.15)
+# spec file for package yast2-installation (Version 2.15.1)
#
# 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.15
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.15.tar.bz2
+Source0: yast2-installation-2.15.1.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
@@ -29,8 +29,8 @@
Requires: yast2-pkg-bindings >= 2.13.101
# ProductControl::Run returning `abort (FATE #300422)
Requires: yast2 >= 2.14.6
-# Languages:GetLanguagesMap, bugzilla #204791
-Requires: yast2-country >= 2.13.35
+# Language::selection_skipped, bugzilla #223258
+Requires: yast2-country >= 2.15.0
Requires: yast2-network yast2-users
Requires: curl release-notes
Requires: autoyast2-installation yast2-online-update
@@ -69,7 +69,7 @@
Jiri Srain <jsrain@xxxxxxx>

%prep
-%setup -n yast2-installation-2.14.15
+%setup -n yast2-installation-2.15.1

%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,6 +133,30 @@
%endif

%changelog -n yast2-installation
+* Thu Dec 07 2006 - locilka@xxxxxxx
+- Reworked adding and removing Add-Ons during the first stage
+ installation. If some Add-Ons are added or removed, the entire
+ workflow is created from scratch (#221377).
+- Using a separate temporary directory for Add-On licenses not to
+ be confused by the previous Add-On.
+- Fixed Second Stage Installation script to handle rebooting
+ after kernel-patch correctly (#224251).
+- Fixed Add-On handling when cancelling adding an Add-On product,
+ before that return value from the previous adding was evaluated.
+- Fixing some texts (#223880)
+- 2.15.1
+* Mon Dec 04 2006 - locilka@xxxxxxx
+- Adding support for own help texts for particular submodules in
+ installation proposal (FATE #301151). Use key "help" in
+ "MakeProposal"'s function result.
+- Adding root_password_ca_check item into the globals of control
+ file set to true for SLES and false otherwise (FATE #300438).
+- A better fix for disabling [Back] button in License Agreement
+ dialog when the previous (Language) dialog has been skipped
+ (223258).
+- 2.15.0
+* Mon Dec 04 2006 - lslezak@xxxxxxx
+- "en_EN" -> "en_GB" in list of the preferred languages for EULA
* Thu Nov 23 2006 - locilka@xxxxxxx
- Disabling [Back] button in License Agreement dialog when the
previous (Language) dialog has been skipped (223258).

++++++ yast2-installation-2.14.15.tar.bz2 -> yast2-installation-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/VERSION new/yast2-installation-2.15.1/VERSION
--- old/yast2-installation-2.14.15/VERSION 2006-11-23 11:20:36.000000000 +0100
+++ new/yast2-installation-2.15.1/VERSION 2006-12-07 10:59:32.000000000 +0100
@@ -1 +1 @@
-2.14.15
+2.15.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/configure new/yast2-installation-2.15.1/configure
--- old/yast2-installation-2.14.15/configure 2006-11-15 15:52:57.000000000 +0100
+++ new/yast2-installation-2.15.1/configure 2006-12-07 11:24:28.000000000 +0100
@@ -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.14.10.
+# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.1.
#
# 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.14.10'
-PACKAGE_STRING='yast2-installation 2.14.10'
+PACKAGE_VERSION='2.15.1'
+PACKAGE_STRING='yast2-installation 2.15.1'
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.14.10 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.15.1 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.14.10:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.15.1:";;
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.14.10
+yast2-installation configure 2.15.1
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.14.10, which was
+It was created by yast2-installation $as_me 2.15.1, 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.14.10'
+ VERSION='2.15.1'


cat >>confdefs.h <<_ACEOF
@@ -2383,7 +2383,7 @@



-VERSION="2.14.10"
+VERSION="2.15.1"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka@xxxxxxx>"

@@ -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.14.10, which was
+This file was extended by yast2-installation $as_me 2.15.1, 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.14.10
+yast2-installation config.status 2.15.1
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.14.15/configure.in new/yast2-installation-2.15.1/configure.in
--- old/yast2-installation-2.14.15/configure.in 2006-11-15 15:52:50.000000000 +0100
+++ new/yast2-installation-2.15.1/configure.in 2006-12-07 11:24:23.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.14.10, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.15.1, 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.10"
+VERSION="2.15.1"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/control/control.xml new/yast2-installation-2.15.1/control/control.xml
--- old/yast2-installation-2.14.15/control/control.xml 2006-10-23 16:15:54.000000000 +0200
+++ new/yast2-installation-2.15.1/control/control.xml 2006-12-04 17:33:44.000000000 +0100
@@ -25,6 +25,7 @@
<display_register_forcereg config:type="boolean">false</display_register_forcereg>
<disable_register_w3m config:type="boolean">false</disable_register_w3m>
<manual_online_update config:type="boolean">true</manual_online_update>
+ <root_password_ca_check config:type="boolean">false</root_password_ca_check>
</globals>
<software>
<delete_old_packages config:type="boolean">true</delete_old_packages>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/doc/proposal/proposal-API.txt new/yast2-installation-2.15.1/doc/proposal/proposal-API.txt
--- old/yast2-installation-2.14.15/doc/proposal/proposal-API.txt 2006-10-09 16:09:06.000000000 +0200
+++ new/yast2-installation-2.15.1/doc/proposal/proposal-API.txt 2006-12-04 16:11:46.000000000 +0100
@@ -213,7 +213,11 @@

This module just caused a change of the root partition.
This is only relevant for the "root part" module.
-
+
+ string help
+
+ Helptext for this module which appears in the standard dialog
+ help (particular helps for modules sorted by presentation order).


map AskUser( boolean has_next )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/desktop_finish.ycp new/yast2-installation-2.15.1/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.14.15/src/clients/desktop_finish.ycp 2006-07-18 11:27:46.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/desktop_finish.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: desktop_finish.ycp 31885 2006-07-17 08:14:59Z jsrain $
+ * $Id: desktop_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
*
*/

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_add-on.ycp new/yast2-installation-2.15.1/src/clients/inst_add-on.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_add-on.ycp 2006-06-26 09:10:54.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/inst_add-on.ycp 2006-12-06 18:51:42.000000000 +0100
@@ -30,9 +30,6 @@

if (ret == `next)
{
- foreach (map<string,any> prod, AddOnProduct::add_on_products, {
- AddOnProduct::Integrate (prod["media"]:0);
- });
ret = ProductControl::RunFrom (
ProductControl::CurrentStep () + 1,
true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_congratulate.ycp new/yast2-installation-2.15.1/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_congratulate.ycp 2006-11-15 11:42:10.000000000 +0100
+++ new/yast2-installation-2.15.1/src/clients/inst_congratulate.ycp 2006-12-07 11:20:52.000000000 +0100
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 34401 2006-11-15 10:42:07Z locilka $
+ * $Id: inst_congratulate.ycp 34843 2006-12-07 10:20:49Z locilka $
*/

{
@@ -56,7 +56,12 @@
integer space = display["TextMode"]:true ? 1 : 3;
string vendor_url_tmp = ProductFeatures::GetStringFeature("globals", "vendor_url");

+ // fallback
string vendor_url = "http://www.novell.com/linux/";;
+ if (ProductFeatures::GetStringFeature("globals", "ui_mode") == "simple") {
+ vendor_url = "http://www.openSUSE.org";;
+ }
+ y2milestone ("UI mode: %1", ProductFeatures::GetStringFeature("globals", "ui_mode"));

if (vendor_url_tmp != nil && vendor_url_tmp != "")
vendor_url = vendor_url_tmp;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_finish.ycp new/yast2-installation-2.15.1/src/clients/inst_finish.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_finish.ycp 2006-09-13 11:12:49.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/inst_finish.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -6,7 +6,7 @@
* Arvin Schnell <arvin@xxxxxxx>
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: inst_finish.ycp 32850 2006-09-13 09:14:23Z locilka $
+ * $Id: inst_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_license.ycp new/yast2-installation-2.15.1/src/clients/inst_license.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_license.ycp 2006-10-09 13:28:35.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/inst_license.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Generic License File
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: inst_license.ycp 33271 2006-10-09 11:28:31Z locilka $
+ * $Id: inst_license.ycp 33279 2006-10-09 14:16:49Z locilka $
*
*/

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_proposal.ycp new/yast2-installation-2.15.1/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_proposal.ycp 2006-11-20 09:00:09.000000000 +0100
+++ new/yast2-installation-2.15.1/src/clients/inst_proposal.ycp 2006-12-04 17:08:15.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: inst_proposal.ycp 34452 2006-11-20 08:00:07Z locilka $
+ * $Id: inst_proposal.ycp 34739 2006-12-04 16:08:14Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -59,6 +59,9 @@
boolean have_blocker = false;
string proposal_mode = "";

+ // FATE #301151: Allow YaST proposals to have help texts
+ map <string, string> submodule_helps = $[];
+
symbol proposal_result = nil;

// skip if not interactive mode.
@@ -218,6 +221,8 @@
Wizard::DisableNextButton ();
UI::BusyCursor();

+ submodule_helps = $[];
+
y2debug("Submodules list before execution: %1", submodules );
foreach ( string submod, submodules,
``{
@@ -240,6 +245,35 @@
}

prop_map = submod_make_proposal( submod, force_reset, language_changed );
+
+ if (haskey (prop_map, "help"))
+ {
+ boolean use_this_help = false;
+ // using tabs
+ if (haskey (mod2tab, submod)) {
+ // visible in the current tab
+ if (mod2tab[submod]:999 == current_tab) {
+ use_this_help = true;
+ }
+ // not using tabs
+ } else {
+ use_this_help = true;
+ }
+
+ if (use_this_help) {
+ y2milestone("Submodule '%1' has it's own help", submod);
+ string own_help = prop_map["help"]:"";
+
+ if (own_help == nil) {
+ y2error ("Help text cannot be 'nil'");
+ } else if (own_help == "") {
+ y2milestone ("Skipping empty help");
+ } else {
+ submodule_helps[submod] = prop_map["help"]:"";
+ }
+ }
+ }
+

// check if it is needed to switch to another tab
// because of an error
@@ -301,6 +335,12 @@
skip_the_rest = true;
}
});
+
+ // FATE #301151: Allow YaST proposals to have help texts
+ if (size(submodule_helps) > 0) {
+ Wizard::SetHelpText (help_text ());
+ }
+
if (has_tab && tab_to_switch < 999 && ! current_tab_affected)
{
// FIXME copy-paste from event loop (but for last 2 lines)
@@ -1004,6 +1044,12 @@
locked by the system administrator, so cannot be changed. To change
a proposal that is locked, ask your system administrator.</p>");
}
+
+ foreach (string submod, submodules_presentation, {
+ if (submodule_helps[submod]:"" != "") {
+ help_text_string = help_text_string + submodule_helps[submod]:"";
+ }
+ });

return help_text_string;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_release_notes.ycp new/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.14.15/src/clients/inst_release_notes.ycp 2006-11-15 13:28:45.000000000 +0100
+++ new/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -7,7 +7,7 @@
*
* Display release notes.
*
- * $Id: inst_release_notes.ycp 33271 2006-10-09 11:28:31Z locilka $
+ * $Id: inst_release_notes.ycp 33279 2006-10-09 14:16:49Z locilka $
*/

{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/installation_worker.ycp new/yast2-installation-2.15.1/src/clients/installation_worker.ycp
--- old/yast2-installation-2.14.15/src/clients/installation_worker.ycp 2006-11-21 13:05:55.000000000 +0100
+++ new/yast2-installation-2.15.1/src/clients/installation_worker.ycp 2006-12-06 18:36:28.000000000 +0100
@@ -91,10 +91,11 @@
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";
+ string file_inst_aborted = Directory::vardir + "/second_stage_aborted";
+ string file_inst_failed = Directory::vardir + "/second_stage_failed";
+ string run_yast_at_boot = Directory::vardir + "/runme_at_boot";
+ string current_step = Directory::vardir + "/step";
+ string file_update_mode = Directory::vardir + "/update_mode";

// Second stage
// FATE #300422
@@ -146,7 +147,7 @@

// Second stage
// Detect mode early to be able to setup steps correctly
- if (Stage::cont () && FileUtils::Exists (Installation::destdir + "/var/lib/YaST2/update_mode"))
+ if (Stage::cont () && FileUtils::Exists (Installation::destdir + file_update_mode))
{
Mode::SetMode ("update");
}
@@ -192,6 +193,7 @@
list<string> files = (list<string>)SCR::Read (.target.ycp, listname);
foreach (string f, files, {
f = Installation::destdir + Directory::etcdir + "/control_files/" + f;
+ y2milestone ("Calling WFIntegrate()");
AddOnProduct::WFIntegrate (f);
});
}
@@ -401,9 +403,9 @@
retranslateWizardDialog();

symbol ret = nil;
- string restart_data_file = "/var/lib/YaST2/continue_installation";
- string reboot_file = "/var/lib/YaST2/reboot";
- string restart_file = "/var/lib/YaST2/restart_yast";
+ string restart_data_file = Directory::vardir + "/continue_installation";
+ string reboot_file = Directory::vardir + "/reboot";
+ string restart_file = Directory::vardir + "/restart_yast";

// Continue the second stage installation
if (Stage::cont ()
@@ -452,8 +454,7 @@

y2milestone("Evaluating ret: %1", ret);

- if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
- {
+ if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step)) {
// restarting yast, removing files that identify the user-abort or installation-crash
// bugzilla #222896
if (FileUtils::Exists (file_inst_aborted)) SCR::Execute (.target.remove, file_inst_aborted);
@@ -462,45 +463,49 @@
// creating new files to identify restart
integer last_step = ProductControl::CurrentStep ();
integer restarting_step = last_step;
- if (ret == `restart_same_step)
- {
+
+ if (ret == `restart_same_step) {
last_step = last_step - 1;
ret = `restart_yast;
}
+
integer next_step = last_step + 1;
+ y2milestone ("Creating %1 file with values %2",
+ restart_data_file, [next_step, restarting_step]);
SCR::Write (.target.string, restart_data_file,
sformat ("%1\n%2", next_step, restarting_step));
- if (ret == `reboot)
- {
+
+ if (ret == `reboot) {
+ y2milestone ("Creating %1 file", reboot_file);
SCR::Execute (.target.bash, sformat (
"touch %1", reboot_file));
- }
- else if (ret == `restart_yast)
- {
+
+ } else if (ret == `restart_yast) {
+ y2milestone ("Creating %1 file", restart_file);
SCR::Execute (.target.bash, sformat (
"touch %1", restart_file));
}
}

// Installation has been aborted
- if (ret == `abort)
- {
+ if (ret == `abort) {
// tell linuxrc that we aborted
Linuxrc::WriteYaSTInf($["Aborted" : "1"]);
}

// re-enable automatic probing
- if (!Mode::test ())
+ if (!Mode::test ()) {
WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe");
+ }

// when the installation is not aborted or YaST is not restarted on purpose
- if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort)
- {
+ if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) {
// remove /etc/install.inf, not needed any more
SCR::Execute (.target.remove, "/etc/install.inf");
if (Mode::update ())
{
- SCR::Execute(.target.remove, "/var/lib/YaST2/update_mode");
+ y2milestone("Removing %1", file_update_mode);
+ SCR::Execute(.target.remove, file_update_mode);
SCR::Execute(.target.bash, "/bin/rm -rf /var/adm/current_package_descr");
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/save_hw_status_finish.ycp new/yast2-installation-2.15.1/src/clients/save_hw_status_finish.ycp
--- old/yast2-installation-2.14.15/src/clients/save_hw_status_finish.ycp 2006-09-25 11:01:56.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/save_hw_status_finish.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: save_hw_status_finish.ycp 33076 2006-09-25 08:59:36Z jsrain $
+ * $Id: save_hw_status_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
*
*/

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/switch_scr_finish.ycp new/yast2-installation-2.15.1/src/clients/switch_scr_finish.ycp
--- old/yast2-installation-2.14.15/src/clients/switch_scr_finish.ycp 2006-10-02 17:07:07.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/switch_scr_finish.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: switch_scr_finish.ycp 33233 2006-10-02 15:07:05Z locilka $
+ * $Id: switch_scr_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
*
*/

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/test_inst_client.ycp new/yast2-installation-2.15.1/src/clients/test_inst_client.ycp
--- old/yast2-installation-2.14.15/src/clients/test_inst_client.ycp 2006-08-23 16:58:34.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/test_inst_client.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: For testing the network and hardware proposals.
* Author: Michal Svec <msvec@xxxxxxx>
*
- * $Id: test_inst_client.ycp 32528 2006-08-23 11:23:58Z jsrain $
+ * $Id: test_inst_client.ycp 33279 2006-10-09 14:16:49Z locilka $
*/

{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/test_proposal.ycp new/yast2-installation-2.15.1/src/clients/test_proposal.ycp
--- old/yast2-installation-2.14.15/src/clients/test_proposal.ycp 2006-08-23 08:30:51.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/test_proposal.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: For testing the network and hardware proposals.
* Author: Michal Svec <msvec@xxxxxxx>
*
- * $Id: test_proposal.ycp 32509 2006-08-22 17:28:33Z mvidner $
+ * $Id: test_proposal.ycp 33279 2006-10-09 14:16:49Z locilka $
*/

{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/umount_finish.ycp new/yast2-installation-2.15.1/src/clients/umount_finish.ycp
--- old/yast2-installation-2.14.15/src/clients/umount_finish.ycp 2006-09-13 14:14:59.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/umount_finish.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: umount_finish.ycp 32853 2006-09-13 12:16:36Z locilka $
+ * $Id: umount_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
*
*/

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/vendor.ycp new/yast2-installation-2.15.1/src/clients/vendor.ycp
--- old/yast2-installation-2.14.15/src/clients/vendor.ycp 2006-07-26 10:58:50.000000000 +0200
+++ new/yast2-installation-2.15.1/src/clients/vendor.ycp 2006-11-29 15:47:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Load vendor driver CD
* Authors: Klaus Kaempf <kkaempf@xxxxxxx>
*
- * $Id: vendor.ycp 31984 2006-07-26 07:21:09Z jsrain $
+ * $Id: vendor.ycp 33279 2006-10-09 14:16:49Z locilka $
*/

{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/include/add-on-workflow.ycp new/yast2-installation-2.15.1/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.14.15/src/include/add-on-workflow.ycp 2006-11-01 18:25:30.000000000 +0100
+++ new/yast2-installation-2.15.1/src/include/add-on-workflow.ycp 2006-12-07 10:07:09.000000000 +0100
@@ -186,6 +186,27 @@
}

/**
+ * Returns begining string for source type
+ *
+ * @param symbol source_type
+ * @return string url begins with...
+ */
+string GetURLBeginsWith (symbol source_type) {
+ string url = "";
+
+ if ( source_type == `ftp ) url = "ftp://";;
+ else if ( source_type == `http ) url = "http://";;
+ else if ( source_type == `https ) url = "https://";;
+ else if ( source_type == `samba ) url = "smb://";
+ else if ( source_type == `nfs ) url = "nfs://";
+ else if ( source_type == `cd ) url = "cd:///";
+ else if ( source_type == `dvd ) url = "dvd:///";
+ else if ( source_type == `local_dir ) url = "dir://";
+
+ return url;
+}
+
+/**
* Run dialog for selecting the media
* @return symbol for wizard sequencer
*/
@@ -224,6 +245,7 @@
continue;


+ createResult = nil;
symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
y2milestone ("Current: %1", input);
if ( input == `slp )
@@ -240,15 +262,7 @@
else if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd,
`local_dir, `specify_url], input))
{
- if ( input == `ftp ) url = "ftp://";;
- else if ( input == `http ) url = "http://";;
- else if ( input == `https ) url = "https://";;
- else if ( input == `samba ) url = "smb://";
- else if ( input == `nfs ) url = "nfs://";
- else if ( input == `cd ) url = "cd:///";
- else if ( input == `dvd ) url = "dvd:///";
- else if ( input == `local_dir ) url = "dir://";
- else url = "";
+ url = GetURLBeginsWith (input);

if (input == `cd || input == `dvd)
{
@@ -276,12 +290,14 @@
do {
url = editUrl( url );
y2milestone ("New url: '%1'", url);
- if ( size( url ) == 0 ) {
- break;
+ if (url == nil || url == "") {
+ continue;
+ } else {
+ y2milestone ("Adding source");
+ createResult = SourceManager::createSource( url);
}
-
- createResult = SourceManager::createSource( url);
} while ( createResult == `again );
+ y2milestone ("New Add-On: finished");
}
}
if (createResult != `ok)
@@ -566,7 +582,7 @@
string product_dir = data["product_dir"]:"";
AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[
"media" : AddOnProduct::src_id,
- "product" : prod["name"]:"",
+ "product" : prod["display_name"]:prod["short_name"]:prod["name"]:"",
"media_url" : url,
"product_dir" : product_dir,
]);
@@ -744,6 +760,7 @@


void Redraw (boolean enable_back, boolean enable_next) {
+ y2milestone ("Called Redraw()");
// main screen heading
string title = _("Add-On Product Installation");

@@ -797,53 +814,82 @@
}
}

+// bugzilla #221377
+// the original control file is stored as /control.xml
+// the other (added) control files are under the
+// /tmp/$yast_tmp/control_files/ directory
+// as $srcid.xml files
+//
symbol RunAddOnMainDialog(boolean enable_back, boolean enable_next) {
Redraw (enable_back, enable_next);
symbol ret = nil;

+ // added / removed
+ boolean some_addon_changed = false;
+
+ // store the initial settings, only once
+ AddOnProduct::StoreInitialSettings();
+
repeat {
- ret = (symbol)Wizard::UserInput();
- if (ret == `abort || ret == `cancel)
- {
+ ret = (symbol) Wizard::UserInput();
+
+ // aborting
+ if (ret == `abort || ret == `cancel) {
if (Popup::ConfirmAbort (`incomplete))
break;
- }
- else if (ret == `delete)
- {
- integer selected = (integer)UI::QueryWidget (`id (`summary), `CurrentItem);
- if (selected == nil)
- {
+
+ // removing add-on
+ } else if (ret == `delete) {
+ integer selected = (integer) UI::QueryWidget (`id (`summary), `CurrentItem);
+ if (selected == nil) {
// message report
Report::Message (_("Select a product to delete."));
continue;
}
- // remove whole media if the product is the onle one on the media
+
+ // remove whole media if the product is the only one on the media
integer media = AddOnProduct::add_on_products[selected, "media"]:-1;
integer med_count = size (filter (map<string,any> prod,
AddOnProduct::add_on_products,
{
return prod["media"]:-1 == media;
}));
- if (med_count == 1)
- {
+ if (med_count == 1) {
y2milestone ("Deleting source %1", media);
Pkg::SourceDelete (media);
}
+
// remove the selected record
AddOnProduct::add_on_products[selected] = nil;
AddOnProduct::add_on_products = filter (map<string,any> prod,
- AddOnProduct::add_on_products,
- {
+ AddOnProduct::add_on_products,
+ {
return prod != nil;
});
+
+ // remove a temporary file, not needed anymore
+ AddOnProduct::RemoveAddOnControlFile (selected);
+ some_addon_changed = true;
+
Redraw (enable_back, enable_next);
- }
- else if (ret == `add)
- {
+
+ // adding new add-on
+ } else if (ret == `add) {
symbol ret = RunWizard ();
+ if (ret == `next) some_addon_changed = true;
Redraw (enable_back, enable_next);
}
+
} until ( ret == `next || ret == `back );
+ y2milestone ("Ret: %1, Some Add-on Added/Removed: %2", ret, some_addon_changed);
+
+ if (Mode::installation() && Stage::initial()) {
+ // bugzilla #221377
+ if (some_addon_changed) {
+ AddOnProduct::ReIntegrateFromScratch();
+ }
+ }
+
return ret;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.14.15/src/modules/AddOnProduct.ycp 2006-07-18 11:27:47.000000000 +0200
+++ new/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp 2006-12-07 08:24:53.000000000 +0100
@@ -29,6 +29,7 @@
import "Popup";
import "InstShowInfo";
import "ProductLicense";
+import "FileUtils";

// variables for installation with product
/**
@@ -86,7 +87,7 @@

global list<integer> mode_config_sources = [];

-
+boolean RedrawWizardSteps ();

/**
* Adapts the inst-sys from the tarball
@@ -213,6 +214,50 @@
system_workflows_prepared = true;
}

+list <map> AddOnProduct::initial_workflows = [];
+list <map> AddOnProduct::initial_proposals = [];
+list <map<string,any> > AddOnProduct::initial_inst_finish = [];
+list <string> AddOnProduct::initial_clone_modules = [];
+
+boolean initial_settings_stored = false;
+
+/**
+ * Stores the initial settings for workflows, proposals, inst_finish, clone_modules
+ * to be able to start from scratch when some part of the workflow modified by add-on
+ * is removed.
+ */
+global void StoreInitialSettings () {
+ // store it only once
+ if (initial_settings_stored) return;
+
+ y2milestone ("Storing initial settings");
+ AddOnProduct::initial_workflows = ProductControl::workflows;
+ AddOnProduct::initial_proposals = ProductControl::proposals;
+ AddOnProduct::initial_inst_finish = ProductControl::inst_finish;
+ AddOnProduct::initial_clone_modules = ProductControl::clone_modules;
+
+ initial_settings_stored = true;
+}
+
+/**
+ * Reset all the workflow and proposals modifications done
+ * by Add-on products.
+ * @see StoreInitialSettings()
+ */
+void ResetSystemWorkflowsAndProposals () {
+ y2milestone ("Restoring initial settings");
+ ProductControl::workflows = AddOnProduct::initial_workflows;
+ ProductControl::proposals = AddOnProduct::initial_proposals;
+ ProductControl::inst_finish = AddOnProduct::initial_inst_finish;
+ ProductControl::clone_modules = AddOnProduct::initial_clone_modules;
+
+ system_proposals_prepared = false;
+ PrepareSystemProposals();
+
+ system_workflows_prepared = false;
+ PrepareSystemWorkflows();
+}
+
/**
* Replace a module in a proposal with a set of other modules
* @param proposal a map describing the proposal
@@ -773,43 +818,56 @@
* @return boolean true on success
*/
global boolean WFIntegrate (string filename) {
+ y2milestone ("WFIntegrate %1", filename);
+
map update_file = XML::XMLToYCPFile (filename);
string name = update_file["display_name"]:"";
boolean ret = UpdateInstallation (update_file["update"]:$[], name,
update_file["textdomain"]:"control");
+
if (! ret)
{
y2error ("Failed to udpate installation workflow");
return false;
}
+
if (! UpdateProductInfo (update_file))
{
y2error ("Failed to set product options");
return false;
}
+
if (! AddNewProposals (update_file["proposals"]:[]))
{
y2error ("Failed to add new proposals");
return false;
}
+
if (! Replaceworkflows (update_file["workflows"]:[]))
{
y2error ("Failed to replace workflows");
return false;
}
+
if (! RedrawWizardSteps ())
{
y2error ("Redrawing the wizard steps failed");
return false;
}
+
if (! UpdateInstFinish (update_file["update", "inst_finish"]:$[]))
{
y2error ("Adding inst_finish steps failed");
return false;
}
+
return true;
}

+string TmpdirForControlFiles () {
+ return (string) SCR::Read (.target.tmpdir) + "/control_files";
+}
+
/**
* Integrate the add-on product to the installation workflow, including
* preparations for 2nd stage and inst-sys update
@@ -819,38 +877,108 @@
global boolean Integrate (integer srcid) {
y2milestone ("Integrating source %1", srcid);

- string filename = Pkg::SourceProvideOptionalFile (srcid, 1, "/installation.xml");
- if (filename == nil)
- {
- y2milestone ("Add-on product control file not found, not touching the workglow");
- }
- else
- {
- if (! WFIntegrate (filename))
- {
+ // Updating workflow or proposals
+
+ // Trying to use a cached file, bugzilla #221377
+ string cached_filename = sformat ("%1/%2.xml", TmpdirForControlFiles(), srcid);
+ string source_filename = nil;
+
+ // A cached copy exists
+ if (FileUtils::Exists (cached_filename)) {
+ y2milestone ("Using cached file %1", cached_filename);
+ source_filename = cached_filename;
+ // Trying file from source
+ } else {
+ y2milestone ("File %1 not cached", cached_filename);
+ // using a file from source
+ source_filename = Pkg::SourceProvideOptionalFile (srcid, 1, "/installation.xml");
+ }
+
+ if (source_filename == nil) {
+ y2milestone ("Add-on product control file not found, not touching the work-flow");
+ // either cached or file from source exists
+ } else {
+ // already cached
+ if (source_filename != cached_filename) {
+ y2milestone ("Copying %1 to %2", source_filename, cached_filename);
+ string tmpdir = TmpdirForControlFiles ();
+ map out = (map) SCR::Execute (.target.bash_output, sformat ("
+test -d '%1' || /bin/mkdir -p '%1';
+/bin/cp -v '%2' '%3';
+", tmpdir, source_filename, cached_filename));
+
+ if (out["exit"]:-1 != 0) {
+ y2error ("Error occurred while copying control file: %1", out);
+
+ // cannot copy, using the non-cached file (fallback)
+ cached_filename = source_filename;
+ }
+ }
+
+ // always use cached file
+ if (! WFIntegrate (cached_filename)) {
y2error ("Workflow update failed");
return false;
}
- string tmpdir = (string)SCR::Read (.target.tmpdir) + "/control_files";
- map out = (map)SCR::Execute (.target.bash_output, sformat ("
-test -d %1 || /bin/mkdir %1;
-/bin/cp %2 %1/%3.xml;
-", tmpdir, filename, srcid));
- if (out["exit"]:-1 != 0)
- {
- y2error ("Error occurred while copying control file: %1", out);
- }
+
control_files_to_add = add (control_files_to_add, sformat ("%1.xml", srcid));
}
+
+ // Updating inst-sys
string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz");
- if (y2update == nil)
- {
+ if (y2update == nil) {
y2milestone ("No YaST update found on the media");
- }
- else
- {
+ } else {
UpdateInstSys (y2update);
}
+
+ return true;
+}
+
+/**
+ * Removes (from disk cache) a control file which was included in
+ * the add-on product.
+ */
+global boolean RemoveAddOnControlFile (integer srcid) {
+ string filename = sformat("%1/%2.xml", TmpdirForControlFiles(), srcid);
+
+ if (FileUtils::Exists (filename)) {
+ y2milestone ("Removing: %1", filename);
+ if ((boolean) SCR::Execute (.target.remove, filename)) {
+ return true;
+ } else {
+ y2error ("Cannot remove file %1", filename);
+ return false;
+ }
+ } else {
+ y2milestone("File %1 does not exist, no need to remove it", filename);
+ return true;
+ }
+}
+
+/**
+ * Some product(s) were removed, reintegrating their control files from scratch.
+ */
+global boolean ReIntegrateFromScratch () {
+ y2milestone ("Reintegration workflows from scratch...");
+ ResetSystemWorkflowsAndProposals ();
+
+ foreach (map<string,any> prod, AddOnProduct::add_on_products, {
+ integer srcid = (integer) prod["media"]:nil;
+
+ if (srcid == nil) {
+ y2error ("Wrong definition of Add-on product: %1, cannot reintegrate", srcid);
+ return;
+ } else {
+ y2milestone ("Reintegrating product %1", prod);
+ Integrate (srcid);
+ }
+ });
+
+ // steps might be changed, forcing redraw
+ y2milestone ("Forcing RedrawWizardSteps()");
+ RedrawWizardSteps ();
+
return true;
}

@@ -871,6 +999,8 @@
return true;
}
list<string> products = splitstring ((string)SCR::Read (.target.string, filelist), "\r\n");
+
+ y2milestone ("Adding products: %1", products);
foreach (string p, products, {
if (p == "")
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/modules/ProductLicense.ycp new/yast2-installation-2.15.1/src/modules/ProductLicense.ycp
--- old/yast2-installation-2.14.15/src/modules/ProductLicense.ycp 2006-11-23 10:51:21.000000000 +0100
+++ new/yast2-installation-2.15.1/src/modules/ProductLicense.ycp 2006-12-07 10:13:47.000000000 +0100
@@ -213,6 +213,7 @@
list<string> available_langs = [];
string license_dir = nil;

+ // Base-product license
if (src_id == nil)
{
if (Stage::initial ())
@@ -226,10 +227,12 @@
if (FileUtils::Exists ("/info.txt"))
info_file = "/info.txt";
}
+ // Add-on-product license
else
{
y2milestone ("Getting license info from source %1", src_id);
- tmpdir = (string) SCR::Read(.target.tmpdir) + "/product-license/";
+ // using a separate license directory for all products
+ tmpdir = sformat("%1/product-license/%2/", (string) SCR::Read(.target.tmpdir), src_id);
license_dir = tmpdir;
string license_file = Pkg::SourceProvideOptionalFile (src_id, 1,
"/media.1/license.zip");
@@ -266,7 +269,7 @@
Language::language,
substring (Language::language, 0, 2), // "it_IT" -> "it"
"en_US",
- "en_EN",
+ "en_GB",
"en",
"" // license.txt fallback
];
@@ -436,13 +439,9 @@
// bug #223258
// disabling back button when the select-language dialog is skipped
//
- // FIXME: hotfix for 10.2, solve better for 10.3
- //
boolean enable_back = true;
- if (Stage::initial () &&
- ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog") &&
- Language::preselected != "en_US"
- ) enable_back = false;
+ if (Language::selection_skipped)
+ enable_back = false;

return AskLicenseAgreement (nil, "",
[ "license\\.txt", "license\\.%1\\.txt" ],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/startup/YaST2.Second-Stage new/yast2-installation-2.15.1/startup/YaST2.Second-Stage
--- old/yast2-installation-2.14.15/startup/YaST2.Second-Stage 2006-08-09 12:31:07.000000000 +0200
+++ new/yast2-installation-2.15.1/startup/YaST2.Second-Stage 2006-11-29 15:47:39.000000000 +0100
@@ -15,7 +15,7 @@
# : We will now prepare YaST2 for the so called continue
# : mode
# :
-# STATUS : $Id: YaST2.Second-Stage 32171 2006-08-04 14:35:07Z jsrain $
+# STATUS : $Id: YaST2.Second-Stage 33280 2006-10-09 14:21:31Z locilka $
#----------------
#set -x

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/startup/YaST2.ssh new/yast2-installation-2.15.1/startup/YaST2.ssh
--- old/yast2-installation-2.14.15/startup/YaST2.ssh 2006-06-26 09:11:01.000000000 +0200
+++ new/yast2-installation-2.15.1/startup/YaST2.ssh 2006-12-07 10:59:55.000000000 +0100
@@ -16,30 +16,62 @@
# : This script is called manually
# :
# :
-# STATUS : $Id: YaST2.ssh 20490 2004-12-03 14:11:24Z ms $
+# STATUS : $Id: YaST2.ssh 34842 2006-12-07 09:59:53Z locilka $
#----------------
-#
-#========================================
-# call YaST2 if flag file exists
-#----------------------------------------
-if [ -f /var/lib/YaST2/runme_at_boot ];then
- /usr/lib/YaST2/startup/YaST2.call installation continue
- rm -fv /var/lib/YaST2/runme_at_boot
-else
- exit 1
-fi

#========================================
# boot into system
#----------------------------------------
+function continue_after_second_stage () {
cat <<-EOF
- continue with booting ...
+
+ Continue with booting ...

You can login with the (new?) root password or the
new created user account in a few seconds ...
+
+EOF
+}
+
+function reboot_during_second_stage () {
+cat <<-EOF
+
+ Your system has been updated and needs to reboot ...
+
+ Reconnect to the system after it reboots and call
+ /usr/lib/YaST2/startup/YaST2.ssh again to continue
+ the installation ...
+
EOF
+}
+
+function not_running_yast () {
+cat <<-EOF
+
+ File /var/lib/YaST2/runme_at_boot does not exist ...
+
+ Not running YaST ...
+
+EOF
+}

#========================================
-# remove flag file
+# call YaST2 if flag file exists
#----------------------------------------
-rm -f /var/lib/YaST2/runme_at_boot
+if [ -f /var/lib/YaST2/runme_at_boot ];then
+
+ # running the second stage installation
+ /usr/lib/YaST2/startup/YaST2.call installation continue
+
+ # second stage installation needs to reboot
+ if [ -f /var/lib/YaST2/reboot ]; then
+ reboot_during_second_stage
+ # second stage has just finished
+ else
+ continue_after_second_stage
+ fi
+else
+ not_running_yast
+
+ exit 1
+fi


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread