Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu May 10 23:29:53 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-04-18 16:45:48.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-05-10 17:20:51.000000000 +0200
@@ -1,0 +2,22 @@
+Thu May 10 17:16:49 CEST 2007 - locilka@suse.cz
+
+- Merged hardware probing (inst_startup) and system probing
+ (inst_system_analysis) into one script to have only one progress
+ dialog instead of two (#271291).
+- openSUSE control file clean-up: The default value for enable_next
+ and enable_back is 'yes'. Only few steps do not allow to go back
+ (#270893).
+- 2.15.22
+
+-------------------------------------------------------------------
+Wed May 9 10:25:37 CEST 2007 - locilka@suse.cz
+
+- Safe qouting of bash command in desktop_finish.
+- CommandLine for inst_release_notes (#269914).
+
+-------------------------------------------------------------------
+Mon May 7 13:43:54 CEST 2007 - ms@suse.de
+
+- don't clobber existing /root/.vnc/passwd file (#271734)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.20.tar.bz2
New:
----
yast2-installation-2.15.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.IO7583/_old 2007-05-10 23:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.IO7583/_new 2007-05-10 23:29:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.20)
+# spec file for package yast2-installation (Version 2.15.22)
#
# Copyright (c) 2007 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.15.20
+Version: 2.15.22
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.20.tar.bz2
+Source0: yast2-installation-2.15.22.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
@@ -83,7 +83,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.20
+%setup -n yast2-installation-2.15.22
%build
%{prefix}/bin/y2tool y2autoconf
@@ -146,6 +146,19 @@
%endif
%changelog
+* Thu May 10 2007 - locilka@suse.cz
+- Merged hardware probing (inst_startup) and system probing
+ (inst_system_analysis) into one script to have only one progress
+ dialog instead of two (#271291).
+- openSUSE control file clean-up: The default value for enable_next
+ and enable_back is 'yes'. Only few steps do not allow to go back
+ (#270893).
+- 2.15.22
+* Wed May 09 2007 - locilka@suse.cz
+- Safe qouting of bash command in desktop_finish.
+- CommandLine for inst_release_notes (#269914).
+* Mon May 07 2007 - ms@suse.de
+- don't clobber existing /root/.vnc/passwd file (#271734)
* Wed Apr 18 2007 - locilka@suse.cz
- Root password dialog has been moved to be the first dialog of the
second stage installation workflow (FATE #301924).
++++++ yast2-installation-2.15.20.tar.bz2 -> yast2-installation-2.15.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/configure new/yast2-installation-2.15.22/configure
--- old/yast2-installation-2.15.20/configure 2007-04-06 17:00:15.000000000 +0200
+++ new/yast2-installation-2.15.22/configure 2007-05-10 17:21:52.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.17.
+# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.22.
#
# 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.17'
-PACKAGE_STRING='yast2-installation 2.15.17'
+PACKAGE_VERSION='2.15.22'
+PACKAGE_STRING='yast2-installation 2.15.22'
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.17 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.15.22 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.17:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.15.22:";;
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.17
+yast2-installation configure 2.15.22
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.17, which was
+It was created by yast2-installation $as_me 2.15.22, 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.17'
+ VERSION='2.15.22'
cat >>confdefs.h <<_ACEOF
@@ -2383,7 +2383,7 @@
-VERSION="2.15.17"
+VERSION="2.15.22"
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.17, which was
+This file was extended by yast2-installation $as_me 2.15.22, 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.17
+yast2-installation config.status 2.15.22
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.20/configure.in new/yast2-installation-2.15.22/configure.in
--- old/yast2-installation-2.15.20/configure.in 2007-04-06 17:00:09.000000000 +0200
+++ new/yast2-installation-2.15.22/configure.in 2007-05-10 17:21:46.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.17, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.15.22, 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.17"
+VERSION="2.15.22"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/src/clients/desktop_finish.ycp new/yast2-installation-2.15.22/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.15.20/src/clients/desktop_finish.ycp 2007-03-19 13:14:41.000000000 +0100
+++ new/yast2-installation-2.15.22/src/clients/desktop_finish.ycp 2007-05-10 16:22:55.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: desktop_finish.ycp 37012 2007-03-19 12:14:37Z locilka $
+ * $Id: desktop_finish.ycp 37863 2007-05-09 08:26:05Z locilka $
*
*/
@@ -21,6 +21,7 @@
import "Mode";
import "ProductFeatures";
import "FileUtils";
+import "String";
any ret = nil;
string func = "";
@@ -192,7 +193,8 @@
if (! FileUtils::Exists (dpmng_file) && FileUtils::Exists ("/usr/bin/touch")) {
y2milestone ("Creating file %1: %2",
dpmng_file,
- SCR::Execute (.target.bash, sformat ("/usr/bin/touch '%1'", dpmng_file))
+ SCR::Execute (.target.bash, sformat ("/usr/bin/touch '%1'",
+ String::Quote (dpmng_file)))
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/src/clients/inst_release_notes.ycp new/yast2-installation-2.15.22/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.15.20/src/clients/inst_release_notes.ycp 2007-04-11 10:23:32.000000000 +0200
+++ new/yast2-installation-2.15.22/src/clients/inst_release_notes.ycp 2007-05-10 16:22:55.000000000 +0200
@@ -3,11 +3,12 @@
* Module: Installation
* Summary: Display release notes
* Authors: Arvin Schnell
- * Jens Daniel Schmidt
+ * Lukas Ocilka
+ * Jens Daniel Schmidt
*
* Display release notes.
*
- * $Id: inst_release_notes.ycp 37380 2007-04-11 08:23:30Z locilka $
+ * $Id: inst_release_notes.ycp 37863 2007-05-09 08:26:05Z locilka $
*/
{
@@ -22,9 +23,21 @@
import "Mode";
import "FileUtils";
import "Label";
+ import "CommandLine";
+ import "Mode";
map argmap = GetInstArgs::argmap();
+ // Bugzilla #269914, CommanLine "support"
+ // argmap is only a map, CommandLine uses string parameters
+ if (size (argmap) == 0 && size (WFM::Args()) > 0) {
+ Mode::SetUI ("commandline");
+ y2milestone ("Mode CommandLine not supported, exiting...");
+ // TRANSLATORS: error message - the module does not provide command line interface
+ CommandLine::Print(_("There is no user interface available for this module."));
+ return `auto;
+ }
+
integer minwidtprodsel = 0;
list<string> relnotesproducts = [];
@@ -284,5 +297,5 @@
} until ( ret == `next || ret == `back );
if (Mode::normal()) Wizard::CloseDialog();
- return ret;
+ return (symbol) ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/src/clients/inst_startup.ycp new/yast2-installation-2.15.22/src/clients/inst_startup.ycp
--- old/yast2-installation-2.15.20/src/clients/inst_startup.ycp 2007-04-05 17:23:30.000000000 +0200
+++ new/yast2-installation-2.15.22/src/clients/inst_startup.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,204 +0,0 @@
-/**
- * Module: inst_startup.ycp
- *
- * Authors: Mathias Kettner
- * Klaus Kaempf
- * Stefan Hundhammer
- * Lukas Ocilka
- *
- * Purpose:
- * This module does the startup:
- * - Find controllers and status enabled/disabled
- * - Probe all controllers for disks
- *
- * $Id: inst_startup.ycp 37342 2007-04-05 15:23:29Z locilka $
- */
-
-{
- textdomain "installation";
-
- import "Arch";
- import "Installation";
-
- import "Hotplug";
- import "StorageControllers";
- import "StorageDevices";
- import "Kernel"; // call constructor, extract cmdline
- import "Report";
- import "Progress";
- import "Wizard";
-
- y2milestone ("inst_startup START");
-
- // Function definitions -->
-
- // --------------------------------------------------------------
- // USB
- // --------------------------------------------------------------
- boolean ActionUSB () {
- Hotplug::StartUSB ();
-
- return true;
- }
-
- // --------------------------------------------------------------
- // FireWire (ieee1394)
- // --------------------------------------------------------------
- boolean ActionFireWire () {
- Hotplug::StartFireWire ();
-
- return true;
- }
-
- // --------------------------------------------------------------
- // Floppy
- // --------------------------------------------------------------
- boolean ActionFloppyDisks () {
- StorageDevices::FloppyReady ();
-
- return true;
- }
-
- boolean found_controllers = true;
-
- // --------------------------------------------------------------
- // Hard disk controllers
- // 1. Probe
- // 2. Initialize (module loading)
- // --------------------------------------------------------------
- // In live_eval mode, all modules have been loaded by linuxrc. But
- // they are loaded by StorageControllers::Initialize(). Well, there
- // also was another reason for skipping StorageControllers::Probe ()
- // but nobody seems to remember more.
- // --------------------------------------------------------------
- boolean ActionHHDControllers () {
- found_controllers = (StorageControllers::Probe () > 0);
-
- return true;
- }
-
- // --------------------------------------------------------------
- // Don't abort or even warn if no storage controllers can be
- // found. Disks might be detected even without proper knowledge
- // about the controller. There's a warning below if no disks were
- // found.
- // --------------------------------------------------------------
- boolean ActionLoadModules () {
- StorageControllers::Initialize ();
-
- return true;
- }
-
- // --------------------------------------------------------------
- // Hard disks
- // --------------------------------------------------------------
- boolean ActionHDDProbe () {
- map targetMap = StorageDevices::Probe (true);
-
- if (size (targetMap) == 0) {
- if (found_controllers) {
- // pop-up error report
- Report::Error(_("No hard disks were found for the installation.
-Please check your hardware!
-"));
- } else {
- // pop-up error report
- Report::Error(_("No hard disks and no hard disk controllers were
-found for the installation.
-Check your hardware.
-"));
- }
-
- return false;
- }
-
- return true;
- }
-
- // <-- Function definitions
-
- list <string> actions_todo = [];
- list <string> actions_doing = [];
- list actions_functions = [];
-
- if (!(Arch::s390 () || Arch::board_iseries ())) {
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Probe USB devices"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Probing USB devices..."));
- actions_functions = add (actions_functions, ActionUSB);
-
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Probe FireWire devices"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Probing FireWire devices..."));
- actions_functions = add (actions_functions, ActionFireWire);
-
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Probe floppy disks devices"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Probing floppy disks devices..."));
- actions_functions = add (actions_functions, ActionFloppyDisks);
- }
-
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Probe hard disk controllers"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Probing hard disk controllers..."));
- actions_functions = add (actions_functions, ActionHHDControllers);
-
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Load kernel modules for hard disk controllers"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Loading kernel modules for hard disk controllers..."));
- actions_functions = add (actions_functions, ActionLoadModules);
-
- // TRANSLATORS: progress step
- actions_todo = add (actions_todo, _("Probe hard disks"));
- // TRANSLATORS: progress step
- actions_doing = add (actions_doing, _("Probing hard disks"));
- actions_functions = add (actions_functions, ActionHDDProbe);
-
- // Dialog definition -->
-
- symbol script_return = `next;
-
- Wizard::CreateDialog ();
- Wizard::SetTitleIcon ("yast-controller");
-
- Progress::New (
- // TRANSLATORS: dialog caption
- _("Hardware Probing"),
- " ",
- size (actions_todo),
- actions_todo,
- actions_doing,
- // TRANSLATORS: dialog help
- _("Please wait while computer hardware is being probed...")
- );
-
- // <-- Dialog definition
-
- foreach (any run_function, actions_functions, {
- Progress::NextStage();
-
- y2milestone ("Running function: %1", run_function);
-
- boolean () run_this = (boolean()) (run_function);
- boolean ret = run_this();
-
- y2milestone ("Function %1 returned %2", run_function, ret);
-
- // Failed
- if (ret != true) {
- script_return = `cancel;
- break;
- }
- });
-
- Progress::Finish();
-
- Wizard::CloseDialog();
-
- return script_return;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/src/clients/inst_system_analysis.ycp new/yast2-installation-2.15.22/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.15.20/src/clients/inst_system_analysis.ycp 2007-04-05 17:24:27.000000000 +0200
+++ new/yast2-installation-2.15.22/src/clients/inst_system_analysis.ycp 2007-05-10 17:21:14.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_system_analysis.ycp 37343 2007-04-05 15:24:26Z locilka $
+ * $Id: inst_system_analysis.ycp 37918 2007-05-10 15:21:11Z locilka $
*
*/
@@ -14,29 +14,141 @@
textdomain "installation";
import "AddOnProduct";
+import "Arch";
import "GetInstArgs";
+import "Hotplug";
import "Installation";
import "Kernel";
import "Label";
import "Linuxrc";
import "Mode";
+import "PackageCallbacksInit";
import "Packages";
import "Popup";
-import "PackageCallbacksInit";
import "Product";
import "ProductControl";
+import "Progress";
+import "Report";
import "RootPart";
import "Stage";
import "Storage";
+import "StorageControllers";
+import "StorageDevices";
import "Update";
import "Wizard";
-import "Progress";
include "installation/misc.ycp";
include "packager/storage_include.ycp";
string start_mode = Mode::mode ();
+ // Function definitions -->
+
+ // --------------------------------------------------------------
+ // USB
+ // --------------------------------------------------------------
+ boolean ActionUSB () {
+ Hotplug::StartUSB ();
+
+ return true;
+ }
+
+ // --------------------------------------------------------------
+ // FireWire (ieee1394)
+ // --------------------------------------------------------------
+ boolean ActionFireWire () {
+ Hotplug::StartFireWire ();
+
+ return true;
+ }
+
+ // --------------------------------------------------------------
+ // Floppy
+ // --------------------------------------------------------------
+ boolean ActionFloppyDisks () {
+ StorageDevices::FloppyReady ();
+
+ return true;
+ }
+
+ boolean found_controllers = true;
+
+ // --------------------------------------------------------------
+ // Hard disk controllers
+ // 1. Probe
+ // 2. Initialize (module loading)
+ // --------------------------------------------------------------
+ // In live_eval mode, all modules have been loaded by linuxrc. But
+ // they are loaded by StorageControllers::Initialize(). Well, there
+ // also was another reason for skipping StorageControllers::Probe ()
+ // but nobody seems to remember more.
+ // --------------------------------------------------------------
+ boolean ActionHHDControllers () {
+ found_controllers = (StorageControllers::Probe () > 0);
+
+ return true;
+ }
+
+ // --------------------------------------------------------------
+ // Don't abort or even warn if no storage controllers can be
+ // found. Disks might be detected even without proper knowledge
+ // about the controller. There's a warning below if no disks were
+ // found.
+ // --------------------------------------------------------------
+ boolean ActionLoadModules () {
+ StorageControllers::Initialize ();
+
+ return true;
+ }
+
+ // --------------------------------------------------------------
+ // Hard disks
+ // --------------------------------------------------------------
+ boolean ActionHDDProbe () {
+ map targetMap = StorageDevices::Probe (true);
+
+ if (size (targetMap) == 0) {
+ if (found_controllers) {
+ // pop-up error report
+ Report::Error(_("No hard disks were found for the installation.
+Please check your hardware!
+"));
+ } else {
+ // pop-up error report
+ Report::Error(_("No hard disks and no hard disk controllers were
+found for the installation.
+Check your hardware.
+"));
+ }
+
+ return false;
+ }
+
+ return true;
+ }
+
+ boolean offer_update = false;
+
+ boolean EvaluateUpdatePossibilities () {
+ y2milestone ("Product flags: %1", Product::flags);
+ if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ()) {
+ offer_update = true;
+ }
+
+ return true;
+ }
+
+ boolean have_linux = false;
+
+ boolean SearchForLinuxPartitions () {
+ if (Storage::HaveLinuxPartitions ()) {
+ have_linux = true;
+ }
+
+ return true;
+ }
+
+ // <-- Function definitions
// FIXME copy-paste from inst_mode
define symbol handle_boot ()
@@ -99,42 +211,6 @@
return `finish;
}
-// help text for installation method
-string help_text = _("<p><big><b>Installation Mode</b></big><br>
-Select what to do:</p>");
-
-// help text for installation method
-help_text = help_text + _("<p>
-Select <b>New Installation</b> if there is no existing Linux system on your
-machine or if you want to replace an existing Linux system completely,
-abandoning all its configuration data.
-</p>");
-
-// help text for installation method
-help_text = help_text + _("<p>
-Select <b>Update an Existing System</b> to update a Linux system already
-installed on your machine. This option preserves configuration settings
-from your existing system whenever possible.
-</p>");
-
-// help text for installation method
-help_text = help_text + _("<p>
-To install an add-on product from separate media together with &product;, select
-<b>Include Add-On Products from Separate Media</b>.</p>
-");
-
-// help text for installation method
-help_text = help_text + _("<p>Select <b>Other Options</b> then
-select <b>Repair Installed System</b> if you have a damaged Linux system on
-your hard disk. This option can try to fix problems automatically.
-</p>");
-
-// help text for installation method
-help_text = help_text + _("<p>Select <b>Other Options</b> then
-select <b>Boot Installed System</b> if you have a Linux system on your hard
-disk that will not boot. With this option, try to fix problems manually.
-</p>");
-
symbol current_expert_mode = `repair;
// see bugzilla #156529
@@ -213,61 +289,100 @@
// constructors might depend on it.
// In autoinst mode, this has been called already.
+list <string> actions_todo = [];
+list <string> actions_doing = [];
+list actions_functions = [];
+
y2milestone ("Probing done: %1", Installation::probing_done);
if (! Installation::probing_done)
{
- if (!Mode::autoinst ())
- {
- WFM::CallFunction("inst_startup", []);
+ if (!Mode::autoinst ()) {
+ if (!(Arch::s390 () || Arch::board_iseries ())) {
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe USB devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing USB devices..."));
+ actions_functions = add (actions_functions, ActionUSB);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe FireWire devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing FireWire devices..."));
+ actions_functions = add (actions_functions, ActionFireWire);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe floppy disks devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing floppy disks devices..."));
+ actions_functions = add (actions_functions, ActionFloppyDisks);
+ }
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe hard disk controllers"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing hard disk controllers..."));
+ actions_functions = add (actions_functions, ActionHHDControllers);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Load kernel modules for hard disk controllers"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Loading kernel modules for hard disk controllers..."));
+ actions_functions = add (actions_functions, ActionLoadModules);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe hard disks"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing hard disks..."));
+ actions_functions = add (actions_functions, ActionHDDProbe);
+
WFM::CallFunction("inst_features", []);
Installation::probing_done = true;
}
}
+// TRANSLATORS: progress step
+actions_todo = add (actions_todo, _("Search for Linux partitions"));
+// TRANSLATORS: progress step
+actions_doing = add (actions_doing, _("Searching for Linux partitions..."));
+actions_functions = add (actions_functions, SearchForLinuxPartitions);
+
+// TRANSLATORS: progress step
+actions_todo = add (actions_todo, _("Evaluate update possibility"));
+// TRANSLATORS: progress step
+actions_doing = add (actions_doing, _("Evaluating update possibility..."));
+actions_functions = add (actions_functions, EvaluateUpdatePossibilities);
+
+Wizard::CreateDialog ();
+Wizard::SetTitleIcon ("yast-controller");
+
Progress::New (
// TRANSLATORS: dialog caption
_("System Probing"),
" ",
- 2,
- [
- // TRANSLATORS: progress step
- _("Evaluate update"),
- // TRANSLATORS: progress step
- _("Search for Linux partitions")
- ],
- [
- // TRANSLATORS: progress step
- _("Evaluating update..."),
- // TRANSLATORS: progress step
- _("Searching for Linux partitions...")
- ],
+ size (actions_todo),
+ actions_todo,
+ actions_doing,
// TRANSLATORS: dialog help
- _("Please wait while installed systems are being probed...")
+ _("Please wait while computer hardware and installed systems are being probed...")
);
-Wizard::SetTitleIcon ("yast-software");
-Progress::NextStage ();
-y2milestone ("Step: Evaluate update");
+foreach (any run_function, actions_functions, {
+ Progress::NextStage();
- boolean offer_update = false;
- y2milestone ("Product flags: %1", Product::flags);
- if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ()) {
- offer_update = true;
- }
+ y2milestone ("Running function: %1", run_function);
-Progress::NextStage ();
-y2milestone ("Step: Has Linux partitions");
+ boolean () run_this = (boolean()) (run_function);
+ boolean ret = run_this();
- boolean have_linux = false;
- if (Storage::HaveLinuxPartitions ()) {
- have_linux = true;
- }
+ y2milestone ("Function %1 returned %2", run_function, ret);
+});
+
+Progress::Finish();
y2milestone ("Have Linux: %1, Offer Update: %2", have_linux, offer_update);
-Progress::Finish ();
-
boolean other_options_disabled = false;
+
if (! (have_linux && offer_update))
{
// to offer add-on products
@@ -285,6 +400,42 @@
return `auto;
}
+// help text for installation method
+string help_text = _("<p><big><b>Installation Mode</b></big><br>
+Select what to do:</p>") +
+
+// help text for installation method
+_("<p>
+Select <b>New Installation</b> if there is no existing Linux system on your
+machine or if you want to replace an existing Linux system completely,
+abandoning all its configuration data.
+</p>") +
+
+// help text for installation method
+_("<p>
+Select <b>Update an Existing System</b> to update a Linux system already
+installed on your machine. This option preserves configuration settings
+from your existing system whenever possible.
+</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>
+") +
+
+// help text for installation method
+_("<p>Select <b>Other Options</b> then
+select <b>Repair Installed System</b> if you have a damaged Linux system on
+your hard disk. This option can try to fix problems automatically.
+</p>") +
+
+// help text for installation method
+_("<p>Select <b>Other Options</b> then
+select <b>Boot Installed System</b> if you have a Linux system on your hard
+disk that will not boot. With this option, try to fix problems manually.
+</p>");
+
Wizard::SetContents (
// dialog caption
_("Installation Mode"), InstModeDialogContent(`install), help_text, true, true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/startup/common/vnc.sh new/yast2-installation-2.15.22/startup/common/vnc.sh
--- old/yast2-installation-2.15.20/startup/common/vnc.sh 2006-11-29 15:47:37.000000000 +0100
+++ new/yast2-installation-2.15.22/startup/common/vnc.sh 2007-05-09 10:11:02.000000000 +0200
@@ -13,7 +13,7 @@
# DESCRIPTION : VNC helper functions to start the Xvnc server
# :
# :
-# STATUS : $Id: vnc.sh 34570 2006-11-22 17:53:31Z ms $
+# STATUS : $Id: vnc.sh 37849 2007-05-07 11:45:48Z ms $
#----------------
. /etc/YaST2/XVersion
@@ -26,11 +26,11 @@
#
VNCPASS_EXCEPTION=0
VNCPASS=$Xbindir/vncpasswd.arg
- if [ ! -e /root/.vnc/passwd ]; then
+ if [ ! -e /root/.vnc/passwd.yast ]; then
rm -rf /root/.vnc && mkdir -p /root/.vnc
- $VNCPASS /root/.vnc/passwd "$VNCPassword"
+ $VNCPASS /root/.vnc/passwd.yast "$VNCPassword"
if [ $? = 0 ];then
- chmod 600 /root/.vnc/passwd
+ chmod 600 /root/.vnc/passwd.yast
else
log "\tcouldn't create VNC password file..."
VNCPASS_EXCEPTION=1
@@ -80,7 +80,7 @@
# Start Xvnc...
#------------------------------------------
$Xbindir/Xvnc $Xvncparam :0 \
- -rfbauth /root/.vnc/passwd \
+ -rfbauth /root/.vnc/passwd.yast \
-desktop "Installation at: $VNC_HOSTNAME" \
-geometry 800x600 \
-depth 16 \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/startup/Second-Stage/S09-cleanup new/yast2-installation-2.15.22/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-2.15.20/startup/Second-Stage/S09-cleanup 2006-11-29 15:47:38.000000000 +0100
+++ new/yast2-installation-2.15.22/startup/Second-Stage/S09-cleanup 2007-05-09 10:11:02.000000000 +0200
@@ -14,7 +14,7 @@
if [ ! -z "$VNC" ] && [ "$VNC" -eq 1 ] ; then
log "\tkill all VNC sessions..."
killall Xvnc &>/dev/null
- rm -fv /root/.vnc/passwd
+ rm -fv /root/.vnc/passwd.yast
fi
# 13.3) stop network and sshd
if test ! -z "$Y2_NETWORK_ACTIVE" ; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.20/VERSION new/yast2-installation-2.15.22/VERSION
--- old/yast2-installation-2.15.20/VERSION 2007-04-18 16:45:39.000000000 +0200
+++ new/yast2-installation-2.15.22/VERSION 2007-05-10 17:19:52.000000000 +0200
@@ -1 +1 @@
-2.15.20
+2.15.22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org