Hello community, here is the log from the commit of package yast2-installation checked in at Fri Apr 28 21:08:38 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-04-25 16:20:24.000000000 +0200 +++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-28 14:14:06.000000000 +0200 @@ -1,0 +2,57 @@ +Fri Apr 28 14:10:50 CEST 2006 - locilka@suse.cz + +- Proper checking for available network when adding an Add-On + product. Network-related options are disabled in case of missing + network both in installation and running system (#170147). +- 2.13.95 + +------------------------------------------------------------------- +Fri Apr 28 11:32:03 CEST 2006 - jsuchome@suse.cz + +- initialize package callbacks for add on product workflow (#170317) +- 2.13.94 + +------------------------------------------------------------------- +Thu Apr 27 16:50:50 CEST 2006 - mvidner@suse.cz + +- Tell libzypp-zmd-backend not to write sources to zypp db, + we are going to do it ourselves (#170113). +- 2.13.93 + +------------------------------------------------------------------- +Thu Apr 27 16:03:39 CEST 2006 - jsrain@suse.de + +- handle missing SHORTLABEL in content file (#170129) +- 2.13.92 + +------------------------------------------------------------------- +Thu Apr 27 14:57:23 CEST 2006 - fehr@suse.de + +- set limit for separate /home to 14G for SLED (#169232) + +------------------------------------------------------------------- +Thu Apr 27 11:16:56 CEST 2006 - ms@suse.de + +- removed update_xf86config call, checking for /dev/psaux was + broken and is no longer needed because the default mouse device + is /dev/input/mice since many versions now (#168816) + +------------------------------------------------------------------- +Thu Apr 27 10:52:08 CEST 2006 - mvidner@suse.cz + +- When asking for update URLs, go trough products, not patterns (#169836). +- 2.13.91 + +------------------------------------------------------------------- +Thu Apr 27 08:34:33 CEST 2006 - locilka@suse.cz + +- Making "SLP Catalog" selection bigger (maximum ncurses size) + (#168718) +- 2.13.90 + +------------------------------------------------------------------- +Tue Apr 25 22:58:52 CEST 2006 - jsrain@suse.de + +- fixed service proposal in SLES control file (#159771) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.89.tar.bz2 New: ---- yast2-installation-2.13.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.FcrzZ2/_old 2006-04-28 21:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.FcrzZ2/_new 2006-04-28 21:07:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.89) +# spec file for package yast2-installation (Version 2.13.95) # # 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.13.89 +Version: 2.13.95 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.89.tar.bz2 +Source0: yast2-installation-2.13.95.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-installation-2.13.89 +%setup -n yast2-installation-2.13.95 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,36 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Fri Apr 28 2006 - locilka@suse.cz +- Proper checking for available network when adding an Add-On + product. Network-related options are disabled in case of missing + network both in installation and running system (#170147). +- 2.13.95 +* Fri Apr 28 2006 - jsuchome@suse.cz +- initialize package callbacks for add on product workflow (#170317) +- 2.13.94 +* Thu Apr 27 2006 - mvidner@suse.cz +- Tell libzypp-zmd-backend not to write sources to zypp db, + we are going to do it ourselves (#170113). +- 2.13.93 +* Thu Apr 27 2006 - jsrain@suse.de +- handle missing SHORTLABEL in content file (#170129) +- 2.13.92 +* Thu Apr 27 2006 - fehr@suse.de +- set limit for separate /home to 14G for SLED (#169232) +* Thu Apr 27 2006 - ms@suse.de +- removed update_xf86config call, checking for /dev/psaux was + broken and is no longer needed because the default mouse device + is /dev/input/mice since many versions now (#168816) +* Thu Apr 27 2006 - mvidner@suse.cz +- When asking for update URLs, go trough products, not patterns (#169836). +- 2.13.91 +* Thu Apr 27 2006 - locilka@suse.cz +- Making "SLP Catalog" selection bigger (maximum ncurses size) + (#168718) +- 2.13.90 +* Tue Apr 25 2006 - jsrain@suse.de +- fixed service proposal in SLES control file (#159771) * Tue Apr 25 2006 - locilka@suse.cz - Return `next instead of `ok in case of SLP Add-On Source (#165989) - 2.13.89 ++++++ yast2-installation-2.13.89.tar.bz2 -> yast2-installation-2.13.95.tar.bz2 ++++++ ++++ 2152 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/VERSION new/yast2-installation-2.13.95/VERSION --- old/yast2-installation-2.13.89/VERSION 2006-04-25 16:19:04.000000000 +0200 +++ new/yast2-installation-2.13.95/VERSION 2006-04-28 14:10:42.000000000 +0200 @@ -1 +1 @@ -2.13.89 +2.13.95 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/configure.in new/yast2-installation-2.13.95/configure.in --- old/yast2-installation-2.13.89/configure.in 2006-04-25 16:22:37.000000000 +0200 +++ new/yast2-installation-2.13.95/configure.in 2006-04-28 14:30:39.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.89, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.95, http://www.suse.de/feedback, 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.13.89" +VERSION="2.13.95" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/clients/add-on.ycp new/yast2-installation-2.13.95/src/clients/add-on.ycp --- old/yast2-installation-2.13.89/src/clients/add-on.ycp 2006-04-03 09:19:53.000000000 +0200 +++ new/yast2-installation-2.13.95/src/clients/add-on.ycp 2006-04-28 14:10:36.000000000 +0200 @@ -12,6 +12,7 @@ import "AddOnProduct"; import "Confirm"; import "PackageLock"; +import "PackageCallbacksInit"; import "Report"; import "Wizard"; import "Pkg"; @@ -30,6 +31,11 @@ return `abort; } +// initialize target to import all trusted keys (#165849) +Pkg::TargetInit( "/", false ); + +PackageCallbacksInit::InitPackageCallbacks (); + // Initialize current sources Read(); symbol ret = RunWizard(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.13.95/src/clients/inst_addon_update_sources.ycp --- old/yast2-installation-2.13.89/src/clients/inst_addon_update_sources.ycp 2006-04-18 13:43:42.000000000 +0200 +++ new/yast2-installation-2.13.95/src/clients/inst_addon_update_sources.ycp 2006-04-27 12:55:34.000000000 +0200 @@ -4,6 +4,10 @@ * Summary: Add installation sources for online update, #163192 * Authors: Martin Vidner <mvidner@suse.cz> * + * Assumptions: + * - the sources have been initialized + * - the sources will be saved afterwards + * (this means that running this client alone will not work) */ { @@ -34,8 +38,8 @@ * @return the installation sources to be added */ list<string> UpdateUrls () { - // get available base patterns - list<map<string,any> > products = Pkg::ResolvableProperties ("", `pattern, ""); + // get all available products + list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); list<list<string> > urls = maplist (map<string, any> p, products, { return p["update_urls"]:[]; }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.95/src/clients/inst_suse_register.ycp --- old/yast2-installation-2.13.89/src/clients/inst_suse_register.ycp 2006-04-21 10:48:42.000000000 +0200 +++ new/yast2-installation-2.13.95/src/clients/inst_suse_register.ycp 2006-04-28 09:02:50.000000000 +0200 @@ -29,6 +29,7 @@ import "Label"; import "Internet"; import "Register"; + import "SourceManager"; // no network - no suse_register if (!Mode::normal()) @@ -527,6 +528,8 @@ /* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */ + // #170113, the lock is needed around everything that may end up in ZMD + SourceManager::Lock (); repeat { ret = Wizard::UserInput(); @@ -772,6 +775,8 @@ } until ( loopend || ret == `back ); + SourceManager::Unlock (); + // Register::finish mandatory as well - do not remove Register::finish(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/clients/inst_suseconfig.ycp new/yast2-installation-2.13.95/src/clients/inst_suseconfig.ycp --- old/yast2-installation-2.13.89/src/clients/inst_suseconfig.ycp 2006-02-03 08:52:17.000000000 +0100 +++ new/yast2-installation-2.13.95/src/clients/inst_suseconfig.ycp 2006-04-27 12:55:34.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Andreas Schwab <schwab@suse.de> * Stefan Hundhammer <sh@suse.de> * - * $Id: inst_suseconfig.ycp 25923 2005-10-18 10:43:48Z ms $ + * $Id: inst_suseconfig.ycp 30530 2006-04-27 09:21:14Z ms $ * * Purpose: * - shows the "Finishing the installation" frame @@ -220,15 +220,6 @@ } } - // ... - // Update mouse configuration if device /dev/mouse or /dev/psaux - // is still in use - // --- - if ( Mode::update () ) - { - SCR::Execute (.target.bash, Directory::ybindir + "/update_xf86config"); - } - if ( Mode::update () ) { return `next; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/include/add-on-workflow.ycp new/yast2-installation-2.13.95/src/include/add-on-workflow.ycp --- old/yast2-installation-2.13.89/src/include/add-on-workflow.ycp 2006-04-25 15:51:53.000000000 +0200 +++ new/yast2-installation-2.13.95/src/include/add-on-workflow.ycp 2006-04-28 14:10:36.000000000 +0200 @@ -89,7 +89,8 @@ `VBox( // translators: popup heading `Heading (_("Choose SLP Catalog")), - `MinSize( 25, 7, + // bugzilla #168718 + `MinSize( 76, 19, // translators: table header `Table (`id(`services), `header( // table header @@ -135,6 +136,34 @@ } /** + * Checks whether some network is available in the current moment, + * see the bug #170147 for more information. + */ +boolean IsAnyNetworkAvailable () { + boolean ret = false; + + string command = "TERM=dumb /sbin/ip -o address show | grep inet | grep -v scope.host"; + y2milestone("Running %1", command); + map cmd_run = (map) SCR::Execute(.target.bash_output, command); + y2milestone("Command returned: %1", cmd_run); + + // command failed + if (cmd_run["exit"]:-1 != 0) { + // some errors were there, we don't know the status, rather return that it's available + // `grep` also returns non zero exit code when there is nothing to do... + if (cmd_run["stdout"]:"" != "") { + y2error("Checking the network failed"); + ret = true; + } + // some devices are listed + } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "") { + ret = true; + } + + return ret; +} + +/** * Creates dialog content for MediaSelect */ void CreateMediaSelectDialog () { @@ -164,15 +193,10 @@ `VStretch () ))), `HStretch () ); - string netdevice = Linuxrc::InstallInf ("Netdevice"); - boolean net_avail = netdevice != "" && netdevice != nil; - if (Stage::initial()) - { - y2milestone ("Network device: %1, Network available: %2", netdevice, net_avail); - } - if (Stage::initial() && ! net_avail) - { - term contents = `HBox (`HStretch (), `VBox ( + if (! IsAnyNetworkAvailable()) { + y2milestone ("Network is not available, skipping all Network-related options..."); + + contents = `HBox (`HStretch (), `VBox ( `RadioButtonGroup (`id (`type), `VBox ( `VStretch (), // radio button @@ -181,9 +205,13 @@ `Left (`RadioButton(`id(`dvd), _("&DVD..."))), // radio button `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), + // radio button + `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), `VStretch () ))), `HStretch () ); + } else { + y2milestone("Network is available, allowing Network-related options..."); } // dialog caption diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/src/modules/Product.ycp new/yast2-installation-2.13.95/src/modules/Product.ycp --- old/yast2-installation-2.13.89/src/modules/Product.ycp 2006-04-24 13:10:06.000000000 +0200 +++ new/yast2-installation-2.13.95/src/modules/Product.ycp 2006-04-27 16:27:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Product data * Authors: Klaus Kaempf <kkaempf@suse.de> * - * $Id: Product.ycp 30370 2006-04-21 21:25:01Z jsrain $ + * $Id: Product.ycp 30541 2006-04-27 14:01:45Z jsrain $ */ { @@ -95,6 +95,8 @@ // not reasonable name = (string) SCR::Read(.content.LABEL); short_name = (string) SCR::Read(.content.SHORTLABEL); + if (short_name == nil) + short_name = name; version = (string) SCR::Read(.content.VERSION); vendor = (string) SCR::Read(.content.VENDOR); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.89/startup/YaST2.call new/yast2-installation-2.13.95/startup/YaST2.call --- old/yast2-installation-2.13.89/startup/YaST2.call 2006-04-10 15:24:02.000000000 +0200 +++ new/yast2-installation-2.13.95/startup/YaST2.call 2006-04-27 12:55:34.000000000 +0200 @@ -21,7 +21,7 @@ # : - VNC Installation via browser # : # : -# STATUS : $Id: YaST2.call 29814 2006-04-06 15:11:36Z ms $ +# STATUS : $Id: YaST2.call 30531 2006-04-27 09:25:41Z ms $ #---------------- # #set -x @@ -355,6 +355,9 @@ log "\t$Y2_OK_MESSAGE" fi if [ $SELECTED_MEDIUM = "SSH" ];then + echo "*** Preparing SSH installation for reboot ***" + echo "*** NOTE: after reboot, you have to reconnect and call ***" + echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" log "\tPreparing SSH installation for reboot" echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...