![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-installation checked in at Fri Aug 8 10:59:22 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-07-16 09:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-08-08 10:25:58.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Aug 7 16:40:32 CEST 2008 - locilka@suse.cz + +- Added new client inst_scenarios to offer main scenarios of the + newly installed system. +- Configuration for inst_scenarios is defined in control file (Only + SLES so far), client added into SLES workflow. +- Extended control file documentation (All FATE #304373). +- 2.17.3 + +------------------------------------------------------------------- +Wed Aug 6 13:54:07 CEST 2008 - locilka@suse.cz + +- New control file entry globals->enable_kdump (default value) + (FATE #303893). +- Adjusted control file documentation. + +------------------------------------------------------------------- +Tue Aug 5 11:48:44 CEST 2008 - locilka@suse.cz + +- Calling reiplauto client in SLES control file before reboot + (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). + +------------------------------------------------------------------- +Mon Aug 04 16:22:55 CEST 2008 - aschnell@suse.de + +- improved text during ssh installation (bnc #411079) + +------------------------------------------------------------------- +Mon Aug 4 10:39:41 CEST 2008 - locilka@suse.cz + +- Added kdump proposal to SLES control file (FATE #303893). + +------------------------------------------------------------------- +Thu Jul 24 13:21:14 CEST 2008 - locilka@suse.cz + +- Using button label "License Translations..." in complex welcome + dialog (bnc #400616). +- SLES and SLED control files adapted to features added in 11.0. +- Added Automatic Configuration support into SLED (FATE #303396). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.17.2.tar.bz2 New: ---- yast2-installation-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Eq2041/_old 2008-08-08 10:59:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Eq2041/_new 2008-08-08 10:59:11.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-installation (Version 2.17.2) +# spec file for package yast2-installation (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-installation -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.17.2.tar.bz2 +Source0: yast2-installation-2.17.3.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -107,7 +114,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.17.2 +%setup -n yast2-installation-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -173,6 +180,31 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Thu Aug 07 2008 locilka@suse.cz +- Added new client inst_scenarios to offer main scenarios of the + newly installed system. +- Configuration for inst_scenarios is defined in control file (Only + SLES so far), client added into SLES workflow. +- Extended control file documentation (All FATE #304373). +- 2.17.3 +* Wed Aug 06 2008 locilka@suse.cz +- New control file entry globals->enable_kdump (default value) + (FATE #303893). +- Adjusted control file documentation. +* Tue Aug 05 2008 locilka@suse.cz +- Calling reiplauto client in SLES control file before reboot + (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). +* Mon Aug 04 2008 aschnell@suse.de +- improved text during ssh installation (bnc #411079) +* Mon Aug 04 2008 locilka@suse.cz +- Added kdump proposal to SLES control file (FATE #303893). +* Thu Jul 24 2008 locilka@suse.cz +- Using button label "License Translations..." in complex welcome + dialog (bnc #400616). +- SLES and SLED control files adapted to features added in 11.0. +- Added Automatic Configuration support into SLED (FATE #303396). * Tue Jul 15 2008 aschnell@suse.de - fixed vnc connect message during installation (bnc #395834) - 2.17.2 ++++++ yast2-installation-2.17.2.tar.bz2 -> yast2-installation-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/configure new/yast2-installation-2.17.3/configure --- old/yast2-installation-2.17.2/configure 2008-07-11 12:46:27.000000000 +0200 +++ new/yast2-installation-2.17.3/configure 2008-08-04 16:40:49.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-installation 2.17.0' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-installation 2.17.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1208,7 +1208,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.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1279,7 +1279,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.17.0:";; + short | recursive ) echo "Configuration of yast2-installation 2.17.2:";; esac cat <<\_ACEOF @@ -1357,7 +1357,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.17.0 +yast2-installation configure 2.17.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1371,7 +1371,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.17.0, which was +It was created by yast2-installation $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2192,7 +2192,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.17.0' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2420,7 +2420,7 @@ -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -3563,7 +3563,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.17.0, which was +This file was extended by yast2-installation $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3606,7 +3606,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.17.0 +yast2-installation config.status 2.17.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/configure.in new/yast2-installation-2.17.3/configure.in --- old/yast2-installation-2.17.2/configure.in 2008-07-11 12:46:24.000000000 +0200 +++ new/yast2-installation-2.17.3/configure.in 2008-08-04 16:40:46.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.17.0, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.17.2, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/control-section.xml new/yast2-installation-2.17.3/control/docs/control-section.xml --- old/yast2-installation-2.17.2/control/docs/control-section.xml 2008-07-15 15:35:06.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/control-section.xml 2008-08-07 17:13:57.000000000 +0200 @@ -393,6 +393,13 @@ <listitem><para>(boolean) <emphasis>rle_offer_rulevel_4</emphasis> - defines whether runlevel 4 should be offered in Runlevel Editor. Defaul value is <emphasis>false</emphasis> if not set.</para></listitem> + + <!-- FATE #303893: [FSC] default to enabled kdump --> + <listitem><para>(boolean) <emphasis>enable_kdump</emphasis> - defines whether + kdump is proposed as <emphasis>enabled</emphasis> in installation proposal. + <emphasis>kdump_proposal</emphasis> client call has to be added into + <link linkend="control_proposals">proposal</link> otherwise this variable + does not have any effect.</para></listitem> </itemizedlist> </section> @@ -700,6 +707,66 @@ </itemizedlist> </section> + + <section id="control_software_scenarios"> + <title>System Scenarios</title> + + <para>System scenarios contain definition of dialog <emphasis>inst_scenarios</emphasis> + in the first stage installation. It offeres several base-scenarios but only one of them + can be selected as the selected one.</para> + + <para>Example of configured scenarios:</para> + <programlisting> + + <xi:include href="examples/software_scenarios.xml" parse="text" + xmlns:xi="http://www.w3.org/2001/XInclude"/> + </programlisting> + + <para>System scenarios are defined inside the <emphasis>software</emphasis> section. + Section <emphasis>system_scenarios</emphasis> consists of several + <emphasis>system_scenario</emphasis> definitions. Every single + <emphasis>system_scenario</emphasis> consists of:</para> + + <itemizedlist> + <listitem><para><emphasis>id</emphasis> - unique identificator of + a selection.</para></listitem> + <listitem><para><emphasis>patterns</emphasis> - space-separated list of patterns + covering the software scenario.</para></listitem> + <listitem><para><emphasis>icon</emphasis> - plain icon filename (from 32x32 theme + directory) without suffix.</para></listitem> + </itemizedlist> + + <para>Selection labels must be defined in <link linkend="control_texts">texts</link> section. + Scenarios <emphasis>id</emphasis>s are used as link identificators.</para> + + <programlisting> + + <software> + <system_scenario> + <id><emphasis>scenario_id</emphasis></id> + </system_scenario> + </software> + + <texts> + <<emphasis>scenario_id</emphasis>><label>Some Label</label></<emphasis>scenario_id</emphasis>> + </texts> + + </programlisting> + + <para>Section <emphasis>software</emphasis> also contains optional + <emphasis>default_system_scenario</emphasis> that defines id of the default scenario.</para> + + <para>There are some important texts that has to be defined for the dialog layout</para> + + <itemizedlist> + <listitem><para><emphasis>scenarios_caption</emphasis> - used as a dialog caption + for the Scenarios dialog.</para></listitem> + <listitem><para><emphasis>scenarios_text</emphasis> - used as an informative text + describing the available selections below.</para></listitem> + </itemizedlist> + + </section> + <section id="control_partitioning"> <title>Partitioning</title> <para> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/globals-automatic_configuration.xml new/yast2-installation-2.17.3/control/docs/examples/globals-automatic_configuration.xml --- old/yast2-installation-2.17.2/control/docs/examples/globals-automatic_configuration.xml 2008-07-14 16:17:04.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/globals-automatic_configuration.xml 2008-07-18 18:20:58.000000000 +0200 @@ -1,51 +1,44 @@ -<globals> - ... +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <globals> + + <!-- List of steps in AC --> + <automatic_configuration config:type="list"> + + <!-- One step definition --> + <ac_step> + <text_id>ac_1</text_id> + <type>scripts</type> + <ac_items config:type="list"> + <ac_item>initialization</ac_item> + <ac_item>hostname</ac_item> + <ac_item>netprobe</ac_item> + <ac_item>rpmcopy_secondstage</ac_item> + </ac_items> + <icon>yast-lan</icon> + </ac_step> + + <ac_step> + <text_id>ac_3</text_id> + <type>proposals</type> + <ac_items config:type="list"> + <ac_item>x11</ac_item> + <ac_item>printer</ac_item> + <ac_item>sound</ac_item> + <ac_item>tv</ac_item> + </ac_items> + <icon>yast-hwinfo</icon> + </ac_step> + + </automatic_configuration> + </globals> + + <texts> + + <!-- Label used during AC, uses "text_id" from "ac_step" --> + <ac_1><label>Initialization...</label><ac_1> + <ac_3><label>Configuring hardware...</label><ac_3> - <!-- List of steps in AC --> - <automatic_configuration config:type="list"> - - <!-- One step definition --> - <ac_step> - <text_id>ac_1</text_id> - <type>scripts</type> - <ac_items config:type="list"> - <ac_item>initialization</ac_item> - <ac_item>hostname</ac_item> - <ac_item>netprobe</ac_item> - <ac_item>rpmcopy_secondstage</ac_item> - </ac_items> - <icon>yast-lan</icon> - </ac_step> - - ... - - <ac_step> - <text_id>ac_3</text_id> - <type>proposals</type> - <ac_items config:type="list"> - <ac_item>x11</ac_item> - <ac_item>printer</ac_item> - <ac_item>sound</ac_item> - <ac_item>tv</ac_item> - </ac_items> - <icon>yast-hwinfo</icon> - </ac_step> - - ... - - </automatic_configuration> - ... -</globals> - -<texts> - - ... - - <!-- Label used during AC, uses "text_id" from "ac_step" --> - <ac_1><label>Initialization...</label><ac_1> - <ac_3><label>Configuring hardware...</label><ac_3> - - ... - -</texts> \ No newline at end of file + </texts> +</productDefines> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/globals-save_instsys_content.xml new/yast2-installation-2.17.3/control/docs/examples/globals-save_instsys_content.xml --- old/yast2-installation-2.17.2/control/docs/examples/globals-save_instsys_content.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/globals-save_instsys_content.xml 2008-07-18 17:53:35.000000000 +0200 @@ -1,11 +1,9 @@ <globals> - ... - <save_instsys_content config:type="list"> - <save_instsys_item> - <instsys_directory>/root/</instsys_directory> - <system_directory>/root/inst-sys/</system_directory> - </save_instsys_item> - </save_instsys_content> - ... + <save_instsys_content config:type="list"> + <save_instsys_item> + <instsys_directory>/root/</instsys_directory> + <system_directory>/root/inst-sys/</system_directory> + </save_instsys_item> + </save_instsys_content> </globals> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/partitions2.xml new/yast2-installation-2.17.3/control/docs/examples/partitions2.xml --- old/yast2-installation-2.17.2/control/docs/examples/partitions2.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/partitions2.xml 2008-07-18 18:21:09.000000000 +0200 @@ -1,4 +1,5 @@ -<partitioning> + +<partitioning> <use_flexible_partitioning config:type="boolean">true</use_flexible_partitioning> <flexible_partitioning> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/partitions.xml new/yast2-installation-2.17.3/control/docs/examples/partitions.xml --- old/yast2-installation-2.17.2/control/docs/examples/partitions.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/partitions.xml 2008-07-18 18:21:05.000000000 +0200 @@ -1,3 +1,4 @@ + <partitioning> <use_flexible_partitioning config:type="boolean">true</use_flexible_partitioning> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/software_scenarios.xml new/yast2-installation-2.17.3/control/docs/examples/software_scenarios.xml --- old/yast2-installation-2.17.2/control/docs/examples/software_scenarios.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.17.3/control/docs/examples/software_scenarios.xml 2008-08-07 15:50:01.000000000 +0200 @@ -0,0 +1,52 @@ + +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <software> + + <!-- list of supported scenarios --> + <system_scenarios config:type="list"> + + <!-- one scenario --> + <system_scenario> + <!-- 'id' matches the text 'scenario_game_server' --> + <id>scenario_game_server</id> + <!-- space-separated list of patterns --> + <patterns>game_server-pattern high-load-server</patterns> + <!-- plain icon filename (from 32x32 directory) without suffix --> + <icon>yast-system</icon> + </system_scenario> + + <system_scenario> + <id>scenario_web_server</id> + <patterns>web_server-pattern</patterns> + <icon>yast-http-server</icon> + </system_scenario> + + <system_scenario> + <id>scenario_nfs_server</id> + <patterns>nfs_server-pattern</patterns> + <icon>yast-nfs-server</icon> + </system_scenario> + + </system_scenarios> + + <!-- this scenario (id) is selected by default --> + <default_system_scenario>scenario_nfs_server</default_system_scenario> + + </software> + + <texts> + + <!-- dialog caption --> + <scenarios_caption><label>Server Base Scenario</label></scenarios_caption> + <!-- informative text between caption and listed scenarios --> + <scenarios_text><label>SUSE Linux Enterprise Server offers several base scenarios. +Choose the one that matches your server the best.</label></scenarios_text> + + <!-- matches the 'id' of one 'system_scenario' --> + <scenario_game_server><label>Game Server</label></scenario_game_server> + <scenario_web_server><label>Web Server</label></scenario_web_server> + <scenario_nfs_server><label>NFS Server</label></scenario_nfs_server> + + </texts> +</productDefines> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/texts.xml new/yast2-installation-2.17.3/control/docs/examples/texts.xml --- old/yast2-installation-2.17.2/control/docs/examples/texts.xml 2008-07-11 11:48:50.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/texts.xml 2008-07-18 17:52:54.000000000 +0200 @@ -8,4 +8,4 @@ <congratulate> <label><p><b>Congratulations!</b></p></label> </congratulate> -</texts> \ No newline at end of file +</texts> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/workflow.xml new/yast2-installation-2.17.3/control/docs/examples/workflow.xml --- old/yast2-installation-2.17.2/control/docs/examples/workflow.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/workflow.xml 2008-07-18 18:21:21.000000000 +0200 @@ -50,3 +50,4 @@ </module> </modules> </workflow> + </workflows> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.3/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.17.2/src/clients/inst_complex_welcome.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/inst_complex_welcome.ycp 2008-07-24 13:21:06.000000000 +0200 @@ -109,7 +109,7 @@ )), `VStretch (), // TRANSLATORS: button label - `Right (`PushButton (`id (`show_fulscreen_license), _("&Show License..."))) + `Right (`PushButton (`id (`show_fulscreen_license), _("License &Translations..."))) )) ) ), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_network_setup.ycp new/yast2-installation-2.17.3/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.17.2/src/clients/inst_network_setup.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/inst_network_setup.ycp 2008-08-04 12:58:51.000000000 +0200 @@ -419,7 +419,7 @@ // TRANSLATORS: error message Report::Error (_("IP address cannot be empty.")); return false; - } else if (! IP::Check4 (ip_address)) { + } else if (! IP::Check4 (ip_address) && ! IP::Check6 (ip_address)) { UI::SetFocus (`id ("ip_address")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -451,7 +451,7 @@ // TRANSLATORS: error message Report::Error (_("Gateway IP address cannot be empty.")); return false; - } else if (! IP::Check4 (gateway)) { + } else if (! IP::Check4 (gateway) && ! IP::Check6 (gateway)) { UI::SetFocus (`id ("gateway")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -467,7 +467,7 @@ // TRANSLATORS: error message Report::Error (_("DNS server IP address cannot be empty.")); return false; - } else if (! IP::Check4 (dns_server)) { + } else if (! IP::Check4 (dns_server) && ! IP::Check6 (dns_server)) { UI::SetFocus (`id ("dns_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -505,7 +505,7 @@ // TRANSLATORS: error message Report::Error (_("Proxy server name or IP address must be set.")); return false; - } else if (! IP::Check4 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { + } else if (! IP::Check4 (proxy_server) && ! IP::Check6 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { UI::SetFocus (`id ("proxy_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_scenarios.ycp new/yast2-installation-2.17.3/src/clients/inst_scenarios.ycp --- old/yast2-installation-2.17.2/src/clients/inst_scenarios.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.17.3/src/clients/inst_scenarios.ycp 2008-08-07 15:24:21.000000000 +0200 @@ -0,0 +1,228 @@ +/** + * File: clients/inst_scenarios.ycp + * Package: Installation (First Stage) + * Summary: Server/Desktop Scenarios + * Authors: Lukas Ocilka <locilka@suse.cz> + * + * $Id:$ + */ + +{ + // See FATE: #304373: Align installation process to use scenarios for Server in early stage + + textdomain "installation"; + + import "ProductControl"; + import "ProductFeatures"; + import "Wizard"; + import "Icon"; + import "Installation"; + import "Popup"; + import "PackageCallbacks"; + import "Report"; + + boolean test_mode = false; + + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { + y2milestone ("Args: %1", WFM::Args()); + if (WFM::Args(0) == "test") test_mode = true; + } + + // load supported scenarios from control file + list <map <string, string> > system_scenarios = + (list <map <string, string> >) ProductFeatures::GetFeature ("software", "system_scenarios"); + + if (system_scenarios == nil || system_scenarios == []) { + y2error ("Undefined software->system_scenarios"); + return `auto; + } + + /** + * Adjusts UI - selected radio button + */ + void SelectAppropriateRadioButton () { + list <map <string, any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + string selected_id = nil; + + // check all scenarios + foreach (map <string, string> one_scenario, system_scenarios, { + list <string> patterns_required = splitstring (one_scenario["patterns"]:"", " \t"); + + integer matching_patterns = 0; + + foreach (map <string, any> one_pattern, patterns, { + if ( + contains (patterns_required, one_pattern["name"]:"") && + (one_pattern["status"]:`a == `installed || one_pattern["status"]:`a == `selected) + ) { + matching_patterns = matching_patterns + 1; + } + }); + + // there are some matching patterns + // they match required patterns + if (matching_patterns > 0 && matching_patterns >= size (patterns_required)) { + y2milestone ("Matching: %1 (%2)", one_scenario["id"]:"", one_scenario["patterns"]:""); + if (selected_id == nil) { + selected_id = one_scenario["id"]:""; + } else { + y2warning ("Scenario %1 already selected", selected_id); + } + } + }); + + // matching patterns found + if (selected_id != nil) { + UI::ChangeWidget (`id (`scenarios), `CurrentButton, selected_id); + + // using fallback from control file + } else { + string default_selection = ProductFeatures::GetStringFeature ("software", "default_system_scenario"); + + if (default_selection == nil || default_selection == "") { + y2warning ("No default selection defined"); + } else { + y2milestone ("Pre-selecting default selection"); + if (UI::WidgetExists (`id (default_selection))) + UI::ChangeWidget (`id (`scenarios), `CurrentButton, default_selection); + else + y2error ("No such selection: %1", default_selection); + } + } + } + + void SelectPatterns (string chosen_selection) { + y2milestone ("User selected: %1", chosen_selection); + + // neutralize 'the other' patterns selected by application + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" != chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Neutralizing pattern: %1", one_pattern); + // false -- only patterns in `selected stage APPL_HIGH will be neutralized + Pkg::ResolvableNeutral (one_pattern, `pattern, false); + }); + } + }); + + // select newly selected patterns for installation + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" == chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Selecting pattern: %1", one_pattern); + Pkg::ResolvableInstall (one_pattern, `pattern); + }); + } + }); + } + + // adjusting test mode - not used in installation + if (test_mode) { + Wizard::CreateDialog(); + Pkg::TargetInit (Installation::destdir, true); + Pkg::SourceStartManager (true); + // pre-select +// foreach (string one_pattern, splitstring (system_scenarios[0,"patterns"]:"", " \t"), { +// Pkg::ResolvableInstall (one_pattern, `pattern); +// }); + Pkg::PkgSolve (true); + } + + y2milestone ("Supported scenarios: %1", system_scenarios); + + term GetDialogContents () { + term dialog_content = `VBox(); + + foreach (map <string, string> one_scenario, system_scenarios, { + dialog_content = add (dialog_content, `HBox ( + `HWeight ( + 1, + (one_scenario["icon"]:"" == "" ? + `Empty () + : + `HBox (`Image (Icon::IconPath (one_scenario["icon"]:""), ""), `HSpacing (2)) + ) + ), + `HWeight ( + 4, + `Left (`RadioButton ( + `id (one_scenario["id"]:""), + ProductControl::GetTranslatedText (one_scenario["id"]:"") + )) + ) + )); + + dialog_content = add (dialog_content, `VSpacing (0.8)); + }); + + dialog_content = `VBox ( + `Label (ProductControl::GetTranslatedText ("scenarios_text")), + `VSpacing (2), + `HSquash (`Frame ( + // TRANSLATORS: frame label + _("Choose Scenario"), + `RadioButtonGroup ( + `id (`scenarios), + `MarginBox (2, 1.3, dialog_content) + ) + )) + ); + + return dialog_content; + } + + // TRANSLATORS: help text + string dialog_help = _("<p>Select a scenario that matches your needs the best. +Additional software can be selected later in software proposal.</p>"); + + // Adjust dialog + Wizard::SetContents ( + ProductControl::GetTranslatedText ("scenarios_caption"), + GetDialogContents(), + dialog_help, + true, + true + ); + Wizard::SetTitleIcon ("yast-software"); + + SelectAppropriateRadioButton(); + + any user_input = nil; + symbol ret = `auto; + + // Handle user input + while (true) { + user_input = UI::UserInput(); + + if (user_input == `next) { + string chosen_selection = (string) UI::QueryWidget (`id (`scenarios), `CurrentButton); + + if (chosen_selection == nil || chosen_selection == "") { + // TRANSLATORS: pop-up message + Report::Message (_("Choose one scenario, please.")); + } else { + SelectPatterns (chosen_selection); + ret = `next; + break; + } + } else if (user_input == `back) { + ret = `back; + break; + } else if (user_input == `abort || user_input == `cancel) { + if (Popup::ConfirmAbort (`painless)) { + ret = `abort; + break; + } + } else { + y2error ("Unexpected ret: %1", user_input); + } + } + + // test mode - not used in installation + if (test_mode) Wizard::CloseDialog(); + + y2milestone ("Returning: %1", ret); + return ret; +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/switch_scr_finish.ycp new/yast2-installation-2.17.3/src/clients/switch_scr_finish.ycp --- old/yast2-installation-2.17.2/src/clients/switch_scr_finish.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/switch_scr_finish.ycp 2008-08-05 12:30:01.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: switch_scr_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ + * $Id: switch_scr_finish.ycp 49690 2008-08-05 10:30:00Z locilka $ * */ @@ -27,29 +27,13 @@ /** * SCR Switch failed. Reporting error, collecting data. - * bugzilla #201058 + * We don't ask whether to run the debugger, just run it. + * + * bnc #201058, #411832 */ void ErrorDuringSCRSwitch (string chroot_dir) { - // import the library once it is needed - import "Popup"; - - y2error("Cannot switch to SCR '%1'", chroot_dir); - - // Ask users whether they want to debug the problem - if (Popup::YesNoHeadline ( - // popup error headline - _("Installation Error"), - // popup question - _("An error occurred while switching to the installed system -and no recovery is possible. -Run the automatic debugger to find out why it has failed?") - )) { - y2milestone("User decided to debug the current problem"); - - RunSCRSwitchDebugger(chroot_dir); - } else { - y2warning("User decided not to debug the current problem"); - } + y2error("Cannot switch to SCR '%1', running debugger", chroot_dir); + RunSCRSwitchDebugger(chroot_dir); } /* Check arguments */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/yast_inf_finish.ycp new/yast2-installation-2.17.3/src/clients/yast_inf_finish.ycp --- old/yast2-installation-2.17.2/src/clients/yast_inf_finish.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/yast_inf_finish.ycp 2008-08-05 12:30:01.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: yast_inf_finish.ycp 46858 2008-04-18 14:01:38Z juhliarik $ + * $Id: yast_inf_finish.ycp 49690 2008-08-05 10:30:00Z locilka $ * */ @@ -24,6 +24,10 @@ import "Keyboard"; import "Directory"; import "String"; +/* +import "Arch"; +import "Reipl"; +*/ include "installation/misc.ycp"; @@ -193,19 +197,53 @@ y2milestone ("Printing message about loading kernel via kexec"); SCR::Write (.dev.tty.stderr, _(" -*********************************************************** +************************************************************** Loading installed kernel using kexec. Trying to load installed kernel via kexec instead of rebooting Please, wait. -*********************************************************** +************************************************************** ") ); } } +/* + // FATE #304940: Change YaST2-Module for s390 Disk adaptors from + // hwconfig scheme to udev-scheme + if (Arch::s390 ()) { + boolean different = true; + map <string, any> oldConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = Reipl::ReadState (); + + if (oldConfiguration != nil) { + y2milestone ("Calling Reipl::ModifyReiplWithBootPartition"); + Reipl::ModifyReiplWithBootPartition (newConfiguration); + + map oldCcwMap = (map)oldConfiguration["ccw"]:nil; + map newCcwMap = (map)newConfiguration["ccw"]:nil; + map oldFcpMap = (map)oldConfiguration["fcp"]:nil; + map newFcpMap = (map)newConfiguration["fcp"]:nil; + + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + } + + y2milestone ("Reipl changed: %1", different); + if (different) { + linuxrc["Root"] = "halt"; + } + } +*/ + linuxrc["Language"] = Language::language; linuxrc["Keytable"] = Keyboard::keymap; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/include/scr_switch_debugger.ycp new/yast2-installation-2.17.3/src/include/scr_switch_debugger.ycp --- old/yast2-installation-2.17.2/src/include/scr_switch_debugger.ycp 2008-04-17 11:08:36.000000000 +0200 +++ new/yast2-installation-2.17.3/src/include/scr_switch_debugger.ycp 2008-08-05 12:27:38.000000000 +0200 @@ -82,18 +82,24 @@ // UI dialog term SCRSwitchDialog () { - return `MarginBox ( - 1, 1, `VBox ( - `MinWidth (70, - // used for progress - `LogView ( - `id (`log_view), - // log-view label - _("&Checking the Installed System..."), - 18, 500 - ) - ), - `ReplacePoint(`id(`dialog_rp), `Empty()) + return `VBox ( + // heading + `Heading (_("Switching to the Installed System Failed")), + // informative text + `Label (_("Running the debugger...")), + `MarginBox ( + 1, 1, `VBox ( + `MinWidth (70, + // used for progress + `LogView ( + `id (`log_view), + // log-view label + _("&Checking the Installed System..."), + 18, 500 + ) + ), + `ReplacePoint(`id(`dialog_rp), `Empty()) + ) ) ); } @@ -109,6 +115,21 @@ UI::ChangeWidget (`id(`log_view), `LastLine, sformat ("%1 %2\n", test_description, (test_result ? result_ok : result_failed)) ); + + UI::ChangeWidget ( + `id(`log_view), `LastLine, + "\n" + + sformat ( + // TRANSLATORS: an error message + // %1 - link to our bugzilla + // %2 - directory where YaST logs are stored + _("This is worth reporting a bug at %1. +Please, attach also all YaST logs stored in the '%2' directory."), + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + ) + + "\n" + ); } // report just some progress diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/startup/YaST2.ssh new/yast2-installation-2.17.3/startup/YaST2.ssh --- old/yast2-installation-2.17.2/startup/YaST2.ssh 2008-04-17 11:08:38.000000000 +0200 +++ new/yast2-installation-2.17.3/startup/YaST2.ssh 2008-08-05 09:40:53.000000000 +0200 @@ -16,7 +16,7 @@ # : This script is called manually # : # : -# STATUS : $Id: YaST2.ssh 34842 2006-12-07 09:59:53Z locilka $ +# STATUS : $Id: YaST2.ssh 49650 2008-08-04 14:24:55Z aschnell $ #---------------- #======================================== @@ -27,8 +27,8 @@ Continue with booting ... - You can login with the (new?) root password or the - new created user account in a few seconds ... + You can login with the (new) root password or the + newly created user account in a few seconds ... EOF } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/VERSION new/yast2-installation-2.17.3/VERSION --- old/yast2-installation-2.17.2/VERSION 2008-07-15 18:29:23.000000000 +0200 +++ new/yast2-installation-2.17.3/VERSION 2008-08-08 10:26:40.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de