Author: juhliarik Date: Wed Feb 6 15:03:18 2008 New Revision: 44193 URL: http://svn.opensuse.org/viewcvs/yast?rev=44193&view=rev Log: adding installing kernel-kdump package Modified: branches/SuSE-SLE-10-SP2-Branch/kdump/src/complex.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/kdump/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/kdump/src/complex.ycp?rev=44193&r1=44192&r2=44193&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/kdump/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/kdump/src/complex.ycp Wed Feb 6 15:03:18 2008 @@ -69,8 +69,10 @@ symbol ReadDialog() { boolean kexec_installed = false; boolean kdump_installed = false; + boolean kernel_kdump_installed = false; boolean kexec_available = false; boolean kdump_available = false; + boolean kernel_kdump_available = false; list <string> package_list = []; Wizard::RestoreHelp(HELPS["read"]:""); @@ -82,6 +84,19 @@ kexec_installed = true; } + if (!Arch::ia64) { + if (Package::Installed("kernel-kdump")) + kernel_kdump_installed = true; + else + kernel_kdump_installed = false; + } else { + kernel_kdump_installed = true; + } + + + + + string kdump =""; //only ppc64 includes package kernel-kdump @@ -104,7 +119,7 @@ } //checking if packages are available - if ((!kexec_installed) || (!kdump_installed)) { + if ((!kexec_installed) || (!kdump_installed) || (!kernel_kdump_installed)) { if (!kexec_installed) kexec_available = Package::Available("kexec-tools"); @@ -116,6 +131,9 @@ kdump_available = Package::Available(kdump); } + if (!kernel_kdump_installed) + kernel_kdump_available = Package::Available("kernel-kdump"); + if ((!kexec_installed) && (!kexec_available)) { if (!Mode::commandline()) { Popup::Error(_("Package for kexec-tools is not available.")); @@ -136,6 +154,17 @@ return `abort; } + if ((!kernel_kdump_installed) && (!kernel_kdump_available)) { + if (!Mode::commandline()) { + Popup::Error(_("Package for kernel-kdump is not available.")); + } else { + CommandLine::Error(_("Package for kernel-kdump is not available.")); + } + y2error("[kdump] (ReadDialog ()) Packages for kernel-kdump is not available."); + return `abort; + } + + //add packages for installation if (!kexec_installed) package_list = add(package_list, "kexec-tools"); @@ -143,6 +172,9 @@ if (!kdump_installed) package_list = add(package_list, kdump); + if (!kernel_kdump_installed) + package_list = add(package_list, "kernel-kdump"); + //install packages if (! PackageSystem::CheckAndInstallPackages(package_list)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org