Author: juhliarik Date: Tue Apr 21 09:42:54 2009 New Revision: 56872 URL: http://svn.opensuse.org/viewcvs/yast?rev=56872&view=rev Log: added fix for bug#399439 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION?rev=56872&r1=56871&r2=56872&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION Tue Apr 21 09:42:54 2009 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes?rev=56872&r1=56871&r2=56872&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes Tue Apr 21 09:42:54 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wri Jun 13 13:55:16 CET 2008 - juhliarik@suse.cz + +- added patch for installing kernel-kdumppae (bnc #399439) +- added fix for problem with selecting 'Saving Target for Kdump + Image' in ncurses 80x25 (bnc #373551) +- V 2.13.12 + +------------------------------------------------------------------- Wed Feb 6 15:09:16 CET 2008 - juhliarik@suse.cz - added installing kernel-kdump bug#357935 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp?rev=56872&r1=56871&r2=56872&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp Tue Apr 21 09:42:54 2009 @@ -355,7 +355,7 @@ //Popup::Message(kernel_version); - y2milestone("[kdump] (GetActualBootSection) kerne version: %1",kernel_version); + y2milestone("[kdump] (GetActualBootSection) kernel version: %1",kernel_version); //boot sections from bootloader Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp?rev=56872&r1=56871&r2=56872&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp Tue Apr 21 09:42:54 2009 @@ -74,6 +74,7 @@ boolean kdump_available = false; boolean kernel_kdump_available = false; list <string> package_list = []; + string kernel_kdump_name = "kernel-kdump"; Wizard::RestoreHelp(HELPS["read"]:""); // Kdump::AbortFunction = PollAbort; @@ -84,8 +85,33 @@ kexec_installed = true; } + // added patch from bwalle for installing kernel-kdumppae if kernel-bigsmp is used + + // when we use the bigsmp kernel on i386, we need kernel-kdumppae + if (Arch::i386()) { + // reading version of kernel + string command = "uname -r"; + map version = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[kdump] (ReadDialog) command read kernel version: %1 output: %2",command, version); + boolean kernel_bigsmp = false; + if (version["exit"]:nil == 0) + { + if (find(version["stdout"]:"", "bigsmp") != -1) + kernel_bigsmp = true; + } else { + y2error("Reading version of kernel fault"); + kernel_bigsmp = false; + } + if (kernel_bigsmp) { + if (Package::Available("kernel-kdumppae") || Package::Installed("kernel-kdumppae")) + kernel_kdump_name = "kernel-kdumppae"; + else + y2milestone ("kernel-kdumppae not available. Falling back to kernel-kdump."); + } + } + if (!Arch::ia64()) { - if (Package::Installed("kernel-kdump")) + if (Package::Installed(kernel_kdump_name)) kernel_kdump_installed = true; else kernel_kdump_installed = false; @@ -93,10 +119,6 @@ kernel_kdump_installed = true; } - - - - string kdump =""; //only ppc64 includes package kernel-kdump @@ -132,7 +154,7 @@ } if (!kernel_kdump_installed) - kernel_kdump_available = Package::Available("kernel-kdump"); + kernel_kdump_available = Package::Available(kernel_kdump_name); if ((!kexec_installed) && (!kexec_available)) { if (!Mode::commandline()) { @@ -173,7 +195,7 @@ package_list = add(package_list, kdump); if (!kernel_kdump_installed) - package_list = add(package_list, "kernel-kdump"); + package_list = add(package_list, kernel_kdump_name); //install packages if (! PackageSystem::CheckAndInstallPackages(package_list)) { Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp?rev=56872&r1=56871&r2=56872&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp Tue Apr 21 09:42:54 2009 @@ -142,7 +142,7 @@ "TargetKdump" : $[ "widget" : `custom, "custom_widget" : `VBox( - `Frame(_("Saving Target for Kdump Image"),`HBox(`HSpacing(1),`VBox( + `Frame(_("Saving Target for Kdump Image"),`HBox(`HSpacing(1),`MinHeight(2,`VBox( `RadioButtonGroup(`id("DumpTarget"), `HBox( `Left(`RadioButton(`id("local_filesystem"), `opt(`notify), "&Local Filesytem")), `Left(`RadioButton(`id("ftp"), `opt(`notify), "F&TP")), @@ -151,7 +151,7 @@ `Left(`RadioButton(`id("cifs"), `opt(`notify), "C&IFS (SMB)")) )) - ))), + )))), `VSpacing(1), `ReplacePoint(`id("Targets"), ftp) @@ -172,7 +172,7 @@ "custom_widget" : `VBox( `CheckBoxFrame(`id("enable_raw_partitions"),_("Enable Ra&w Saving in Initrd"), false, //`Frame(`id("enable_raw_partitions"),_("Enable Ra&w Saving in Initrd"), - `HBox(`HSpacing(1),`VBox( + `HBox(`HSpacing(1), `VBox( `Left(`ComboBox(`id("raw_partitions"), _("The List of A&vailable Raw Partitions of All Disks Without Known Filesystem"))) )) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org