Author: snwint Date: Wed Sep 21 11:56:15 2011 New Revision: 65885 URL: http://svn.opensuse.org/viewcvs/yast?rev=65885&view=rev Log: - enable resume for s390x (bnc #692606) - kernel images are in kernel-*-base package - 2.20.4 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootCommon.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=65885&r1=65884&r2=65885&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed Sep 21 11:56:15 2011 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=65885&r1=65884&r2=65885&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Sep 21 11:56:15 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Sep 21 11:55:12 CEST 2011 - snwint@suse.de + +- enable resume for s390x (bnc #692606) +- kernel images are in kernel-*-base package +- 2.20.4 + +------------------------------------------------------------------- Mon Sep 19 17:14:01 CEST 2011 - snwint@suse.de - s390x: add hvc_iucv=8 to boot options (bnc #718089) Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.ycp?rev=65885&r1=65884&r2=65885&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Wed Sep 21 11:56:15 2011 @@ -81,6 +81,8 @@ string parameters = sformat ("%1 %2", features, termparm); + if (resume != "") + parameters = parameters + sformat (" resume=%1", resume); return parameters; } else @@ -110,7 +112,7 @@ } else if (Arch::s390 ()) { - ret = DefaultKernelParams(""); + ret = DefaultKernelParams("") + " noresume"; } else { @@ -149,7 +151,7 @@ * @return true if STD is available */ global boolean ResumeAvailable () { - return (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()); + return (Arch::i386 () || Arch::x86_64 () || Arch::ia64 () || Arch::s390 ()); } Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=65885&r1=65884&r2=65885&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Wed Sep 21 11:56:15 2011 @@ -458,7 +458,8 @@ false ); // don't create a new RPM database // Then, get the file names in the "selected" kernel package, - string kernel_package = Kernel::ComputePackage(); + // the kernel file is actually in kernel-*-base meanwhile + string kernel_package = Kernel::ComputePackage() + "-base"; list<string> files = Pkg::PkgGetFilelist( kernel_package, `installed ); y2milestone ("kernel package %1 has these files: %2", kernel_package, files); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org