Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2013-03-30 15:01:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "jsuchome@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2013-03-01 09:07:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2013-03-30 15:01:04.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 29 11:58:02 CET 2013 - jsuchome@suse.cz + +- always return boolean from DeployTarImage (bnc#804293) +- make the "Check drivers" error message depend on control.xml + variable (fate#312875, bnc#805251) +- 2.24.0 + +------------------------------------------------------------------- +Wed Mar 13 12:35:54 UTC 2013 - mfilka@suse.com + +- NetworkManager is enabled and active after second stage (bnc#808039) +- 2.23.13 + +------------------------------------------------------------------- +Mon Mar 04 14:42:03 CET 2013 - aschnell@suse.de + +- deactivate RAID before going back to "Disk Activation" during + installation (bnc#806454) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.23.12.tar.bz2 New: ---- yast2-installation-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.QGNJJl/_old 2013-03-30 15:01:07.000000000 +0100 +++ /var/tmp/diff_new_pack.QGNJJl/_new 2013-03-30 15:01:07.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 2.23.12 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-2.23.12.tar.bz2 -> yast2-installation-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/VERSION new/yast2-installation-2.24.0/VERSION --- old/yast2-installation-2.23.12/VERSION 2013-02-14 17:11:34.000000000 +0100 +++ new/yast2-installation-2.24.0/VERSION 2013-03-29 12:11:32.000000000 +0100 @@ -1 +1 @@ -2.23.12 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/configure new/yast2-installation-2.24.0/configure --- old/yast2-installation-2.23.12/configure 2013-02-26 17:55:46.000000000 +0100 +++ new/yast2-installation-2.24.0/configure 2013-03-29 12:11:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-installation 2.23.12. +# Generated by GNU Autoconf 2.69 for yast2-installation 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.23.12' -PACKAGE_STRING='yast2-installation 2.23.12' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-installation 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1258,7 +1258,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.23.12 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1330,7 +1330,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.23.12:";; + short | recursive ) echo "Configuration of yast2-installation 2.24.0:";; esac cat <<\_ACEOF @@ -1410,7 +1410,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.23.12 +yast2-installation configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1427,7 +1427,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.23.12, which was +It was created by yast2-installation $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2366,7 +2366,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.23.12' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2489,7 +2489,7 @@ -VERSION="2.23.12" +VERSION="2.24.0" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <jsuchome@suse.cz>" @@ -3648,7 +3648,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.23.12, which was +This file was extended by yast2-installation $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3701,7 +3701,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-installation config.status 2.23.12 +yast2-installation config.status 2.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/configure.in new/yast2-installation-2.24.0/configure.in --- old/yast2-installation-2.23.12/configure.in 2013-02-26 17:55:42.000000000 +0100 +++ new/yast2-installation-2.24.0/configure.in 2013-03-29 12:11:43.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.23.12, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.24.0, 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.23.12" +VERSION="2.24.0" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <jsuchome@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/control/control.SLED.xml new/yast2-installation-2.24.0/control/control.SLED.xml --- old/yast2-installation-2.23.12/control/control.SLED.xml 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/control/control.SLED.xml 2013-03-29 12:11:32.000000000 +0100 @@ -37,6 +37,9 @@ <root_password_as_first_user config:type="boolean">false</root_password_as_first_user> <root_password_ca_check config:type="boolean">false</root_password_ca_check> + <!-- Guide user to drivers.suse.com if HW was not found (FATE#312875)--> + <show_drivers_info config:type="boolean">false</show_drivers_info> + <!-- Offer add-ons in the installation --> <show_addons config:type="boolean">true</show_addons> <addons_default config:type="boolean">false</addons_default> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/control/control.SLES.xml new/yast2-installation-2.24.0/control/control.SLES.xml --- old/yast2-installation-2.23.12/control/control.SLES.xml 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/control/control.SLES.xml 2013-03-29 12:11:32.000000000 +0100 @@ -34,6 +34,9 @@ <manual_online_update config:type="boolean">true</manual_online_update> <root_password_ca_check config:type="boolean">true</root_password_ca_check> + <!-- Guide user to drivers.suse.com if HW was not found (FATE#312875)--> + <show_drivers_info config:type="boolean">true</show_drivers_info> + <!-- Offer add-ons in the installation --> <show_addons config:type="boolean">true</show_addons> <addons_default config:type="boolean">false</addons_default> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/control/control.openSUSE.xml new/yast2-installation-2.24.0/control/control.openSUSE.xml --- old/yast2-installation-2.23.12/control/control.openSUSE.xml 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/control/control.openSUSE.xml 2013-03-29 12:11:32.000000000 +0100 @@ -40,6 +40,9 @@ <show_online_repositories config:type="boolean">false</show_online_repositories> <online_repositories_default config:type="boolean">true</online_repositories_default> + <!-- Guide user to drivers.suse.com if HW was not found (FATE#312875)--> + <show_drivers_info config:type="boolean">false</show_drivers_info> + <!-- Offer add-ons in the installation --> <show_addons config:type="boolean">true</show_addons> <addons_default config:type="boolean">false</addons_default> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/control/control.rnc new/yast2-installation-2.24.0/control/control.rnc --- old/yast2-installation-2.23.12/control/control.rnc 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/control/control.rnc 2013-03-29 12:11:32.000000000 +0100 @@ -91,6 +91,7 @@ | services_proposal | ac_redraw_and_ignore | debug_deploying + | show_drivers_info ## Default kernel parameters proposed by bootloader additional_kernel_parameters = element additional_kernel_parameters { text } @@ -163,6 +164,7 @@ ## Defines whether kdump is enabled by default enable_kdump = element enable_kdump { BOOLEAN } require_registration = element require_registration { BOOLEAN } +show_drivers_info = element show_drivers_info { BOOLEAN } ## Defines which pieces of installation system should be copied to ## the installed system before rebooting to second stage. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/control/control.rng new/yast2-installation-2.24.0/control/control.rng --- old/yast2-installation-2.23.12/control/control.rng 2013-01-23 12:49:24.000000000 +0100 +++ new/yast2-installation-2.24.0/control/control.rng 2013-03-29 12:11:57.000000000 +0100 @@ -99,6 +99,7 @@ <ref name="services_proposal"/> <ref name="ac_redraw_and_ignore"/> <ref name="debug_deploying"/> + <ref name="show_drivers_info"/> </choice> </define> <define name="additional_kernel_parameters"> @@ -326,6 +327,11 @@ <ref name="BOOLEAN"/> </element> </define> + <define name="show_drivers_info"> + <element name="show_drivers_info"> + <ref name="BOOLEAN"/> + </element> + </define> <define name="save_instsys_content"> <a:documentation>Defines which pieces of installation system should be copied to the installed system before rebooting to second stage.</a:documentation> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/src/clients/inst_disks_activate.ycp new/yast2-installation-2.24.0/src/clients/inst_disks_activate.ycp --- old/yast2-installation-2.23.12/src/clients/inst_disks_activate.ycp 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/src/clients/inst_disks_activate.ycp 2013-03-06 15:03:21.000000000 +0100 @@ -19,7 +19,7 @@ */ /** - * File: clients/inst_disk_activate.ycp + * File: clients/inst_disks_activate.ycp * Package: Activation of disks (DASD, zFCP, iSCSI) during installation * Summary: Main file * Authors: Jiri Srain <jsrain@suse.cz> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/src/clients/inst_system_analysis.ycp new/yast2-installation-2.24.0/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.23.12/src/clients/inst_system_analysis.ycp 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/src/clients/inst_system_analysis.ycp 2013-03-29 12:11:32.000000000 +0100 @@ -41,6 +41,7 @@ import "Packages"; import "Popup"; import "Product"; +import "ProductFeatures"; import "Progress"; import "Report"; import "Storage"; @@ -61,6 +62,7 @@ // This dialog in not interactive // always return `back when came from the previous dialog if (GetInstArgs::going_back()) { + Storage::ActivateHld(false); return `back; } @@ -129,15 +131,23 @@ boolean ActionHDDProbe () { map targetMap = StorageDevices::Probe (true); + // additonal error when HW was not found + string drivers_info = _(" +Check 'drivers.suse.com' if you need specific hardware drivers for installation."); + + if (!ProductFeatures::GetBooleanFeature ("globals", "show_drivers_info")) + { + drivers_info = ""; + } + if (size (targetMap) == 0) { if (found_controllers || Arch::s390 ()) { if( !(Mode::autoinst() || Mode::autoupgrade())) { // pop-up error report - Report::Error(_("No hard disks were found for the installation. + Report::Error(sformat (_("No hard disks were found for the installation. Please check your hardware! - -Check 'drivers.suse.com' if you need specific hardware drivers for installation. -")); +%1 +"), drivers_info)); } else { Report::Warning(_("No hard disks were found for the installation. During an automatic installation, they might be detected later. @@ -146,12 +156,11 @@ } } else { // pop-up error report - Report::Error(_("No hard disks and no hard disk controllers were + Report::Error (sformat (_("No hard disks and no hard disk controllers were found for the installation. Check your hardware. - -Check 'drivers.suse.com' if you need specific hardware drivers for installation. -")); +%1 +"), drivers_info)); } return false; @@ -175,6 +184,7 @@ } boolean SearchForLinuxPartitions () { + Storage::ReReadTargetMap(); if (Storage::HaveLinuxPartitions ()) { InstData::have_linux = true; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/src/modules/ImageInstallation.ycp new/yast2-installation-2.24.0/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.23.12/src/modules/ImageInstallation.ycp 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/src/modules/ImageInstallation.ycp 2013-03-29 12:11:32.000000000 +0100 @@ -274,6 +274,12 @@ map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); + if (out["exit"]:-1 != 0) + { + y2error ("no directory to extract into, aborting"); + return false; + } + y2milestone ("Untarring the image"); // lzma @@ -356,7 +362,7 @@ y2milestone ("Finished"); if (aborted) - return nil; + return false; // adjust labels etc. if (tar_image_progress != nil) @@ -364,7 +370,7 @@ RemoveTemporaryImage (image); - return out["exit"]:-1 == 0; + return true; } /** @@ -661,7 +667,7 @@ if (progress != nil) progress (num, 0); - if (DeployImage (img, target) == nil) { + if (!DeployImage (img, target)) { aborted = true; y2milestone ("Aborting..."); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.12/startup/Second-Stage/S09-cleanup new/yast2-installation-2.24.0/startup/Second-Stage/S09-cleanup --- old/yast2-installation-2.23.12/startup/Second-Stage/S09-cleanup 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-2.24.0/startup/Second-Stage/S09-cleanup 2013-03-19 08:26:32.000000000 +0100 @@ -17,10 +17,17 @@ rm -fv /root/.vnc/passwd.yast fi # 13.3) stop network and sshd -if test ! -z "$Y2_NETWORK_ACTIVE" ; then +if [ "$Y2_NETWORK_ACTIVE" -ne 0 ] ; then log "\tShutdown SSH daemon and network interfaces..." test -z "$Y2_SSH_ACTIVE" && rcsshd stop - rcnetwork stop + +# +# network mustn't be stopped when using systemd - systemd ignores +# network service startup in such case. +# restart is used to force reconfiguration of network - first stage +# config is used up to now. +# + rcnetwork restart fi # 13.4) stop pcmcia service if [ -x /sbin/rcpcmcia ] ; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org