Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Thu Apr 28 15:12:07 CEST 2011.
-------- --- yast2-installation/yast2-installation.changes 2011-03-25 10:48:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-04-27 15:10:51.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 27 15:08:04 CEST 2011 - [email protected] + +- added option to configure FCoE Interfaces when started with + WithFCoE=1 argument (fate#307445) +- 2.21.3 + +------------------------------------------------------------------- +Wed Apr 27 11:19:50 CEST 2011 - [email protected] + +- Copy /media.1/build to the installed system (fate#311377) +- 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.21.1.tar.bz2 New: ---- yast2-installation-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.6yY5Nx/_old 2011-04-28 15:11:40.000000000 +0200 +++ /var/tmp/diff_new_pack.6yY5Nx/_new 2011-04-28 15:11:40.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.21.1 +Version: 2.21.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.1.tar.bz2 +Source0: yast2-installation-2.21.3.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.1 +%setup -n yast2-installation-2.21.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.21.1.tar.bz2 -> yast2-installation-2.21.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/VERSION new/yast2-installation-2.21.3/VERSION --- old/yast2-installation-2.21.1/VERSION 2011-03-25 10:47:21.000000000 +0100 +++ new/yast2-installation-2.21.3/VERSION 2011-04-27 15:09:49.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/clients/inst_disks_activate.ycp new/yast2-installation-2.21.3/src/clients/inst_disks_activate.ycp --- old/yast2-installation-2.21.1/src/clients/inst_disks_activate.ycp 2009-12-18 14:52:04.000000000 +0100 +++ new/yast2-installation-2.21.3/src/clients/inst_disks_activate.ycp 2011-04-27 13:01:21.000000000 +0200 @@ -23,6 +23,7 @@ import "Arch"; import "GetInstArgs"; import "Label"; +import "Linuxrc"; import "Popup"; import "Storage"; import "Wizard"; @@ -32,6 +33,7 @@ boolean have_dasd = false; boolean have_zfcp = false; +boolean want_fcoe = false; void RestoreButtons (boolean enable_back, boolean enable_next) { Wizard::RestoreAbortButton(); @@ -72,7 +74,9 @@ UI::CloseDialog (); } -if (have_dasd || have_zfcp) +want_fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; + +if (have_dasd || have_zfcp || want_fcoe) { // dialog caption string caption = _("Disk Activation"); @@ -93,6 +97,12 @@ _("Configure &ZFCP Disks"))) : `VSpacing (0), `VSpacing (have_zfcp ? 2 : 0), + want_fcoe + ? `HWeight (1, `PushButton (`id (`fcoe), `opt (`hstretch), + // push button + _("Configure &FCoE Interfaces"))) + : `VSpacing (0), + `VSpacing (want_fcoe? 2 : 0), `HWeight (1, `PushButton (`id (`iscsi), `opt (`hstretch), // push button _("Configure &iSCSI Disks"))), @@ -121,7 +131,12 @@ } else if (ret == `iscsi) { - ret = WFM::call ("inst_iscsi-client"); + ret = WFM::call ("inst_iscsi-client", [argmap]); + ret = `redraw; + } + else if (ret == `fcoe) + { + ret = WFM::call ("inst_fcoe-client", [argmap]); ret = `redraw; } if (ret == `redraw) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/include/inst_inc_all.ycp new/yast2-installation-2.21.3/src/include/inst_inc_all.ycp --- old/yast2-installation-2.21.1/src/include/inst_inc_all.ycp 2011-02-08 21:27:44.000000000 +0100 +++ new/yast2-installation-2.21.3/src/include/inst_inc_all.ycp 2011-04-27 13:01:15.000000000 +0200 @@ -199,8 +199,9 @@ // update the workflow according to current situation // disable disks activation if not needed boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1"; + boolean fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; - if (! (Arch::s390() || iscsi)) { + if (! (Arch::s390() || iscsi || fcoe)) { y2milestone ("Disabling disk activation module"); ProductControl::DisableModule ("disks_activate"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.21.3/src/inst_finish/copy_files_finish.ycp --- old/yast2-installation-2.21.1/src/inst_finish/copy_files_finish.ycp 2010-04-26 15:20:53.000000000 +0200 +++ new/yast2-installation-2.21.3/src/inst_finish/copy_files_finish.ycp 2011-04-27 13:00:13.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: copy_files_finish.ycp 61719 2010-04-15 15:12:45Z locilka $ + * $Id: copy_files_finish.ycp 63870 2011-04-27 11:00:10Z jsuchome $ * */ @@ -20,6 +20,7 @@ import "Linuxrc"; import "Installation"; import "Directory"; +import "Packages"; import "ProductControl"; import "FileUtils"; import "String"; @@ -168,6 +169,22 @@ ) ); + // Copy /media.1/build to the installed system (fate#311377) + integer src_id = Packages::GetBaseSourceID(); + string build_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/build"); + if (build_file != nil) + { + y2milestone ("Copying /media.1/build file"); + WFM::Execute (.local.bash, + sformat ( + "/bin/cp '%1' '%2%3/' && /bin/chmod 0644 '%2%3/build'", + String::Quote (build_file), + String::Quote (Installation::destdir), + String::Quote (Directory::etcdir) + ) + ); + } + // List of files used as additional workflow definitions CopyAllWorkflowFiles(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
