Author: juhliarik Date: Thu Jul 17 17:23:57 2008 New Revision: 49228 URL: http://svn.opensuse.org/viewcvs/yast?rev=49228&view=rev Log: added support for autoyast (FATE #303263) and installation (FATE #303893) M kdump/VERSION M kdump/package/yast2-kdump.changes * new version 2.17.2 M kdump/config/kdump.rnc * update map for autoyast M kdump/src/uifunctions.ycp * update calling installation packages M kdump/src/kdump.desktop * support for autoyast M kdump/src/kdump_proposal.ycp * corrections M kdump/src/Kdump.ycp * added checking of XEN section * added support for installing packages M kdump/src/kdump_finish.ycp * corrections M kdump/yast2-kdump.spec.in * added handling files Modified: trunk/kdump/VERSION trunk/kdump/config/kdump.rnc trunk/kdump/package/yast2-kdump.changes trunk/kdump/src/Kdump.ycp trunk/kdump/src/kdump.desktop trunk/kdump/src/kdump_finish.ycp trunk/kdump/src/kdump_proposal.ycp trunk/kdump/src/uifunctions.ycp trunk/kdump/yast2-kdump.spec.in Modified: trunk/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/VERSION?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/VERSION (original) +++ trunk/kdump/VERSION Thu Jul 17 17:23:57 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/kdump/config/kdump.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/config/kdump.rnc?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/config/kdump.rnc (original) +++ trunk/kdump/config/kdump.rnc Thu Jul 17 17:23:57 2008 @@ -6,10 +6,12 @@ kdump = element kdump { kdump_crash_kernel? & + kdump_add_crash_kernel? & kdump_general? } kdump_crash_kernel = element crash_kernel { text } +kdump_add_crash_kernel = element add_crash_kernel { BOOLEAN } kdump_general = element general { Modified: trunk/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/package/yast2-kdump.changes?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/package/yast2-kdump.changes (original) +++ trunk/kdump/package/yast2-kdump.changes Thu Jul 17 17:23:57 2008 @@ -1,5 +1,13 @@ ------------------------------------------------------------------- +Thu Jul 8 15:20:43 CET 2008 - juhliarik@suse.cz + +- added support for autoyast (fate #303263) +- added support fot installation (fate #303893) +- V 2.17.2 + +------------------------------------------------------------------- Thu Jun 19 15:54:43 CET 2008 - juhliarik@suse.cz + - added fix for CIFS is cifs-mount is not installed (bnc #307307) - added fix for CIFS problem with path of directory (bnc #307336) - added fix for adding crashkernel to XEN boot section(bnc #390842) Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Jul 17 17:23:57 2008 @@ -74,6 +74,10 @@ */ global list <string> available_partitions =[]; +/** + * true if propose was called + */ +global boolean propose_called = false; /** * List of available partiotions @@ -99,6 +103,11 @@ global boolean crashkernel_list_ranges = false; +/** + * list of packages for installation + */ +global list<string> kdump_packages =[]; + /** * Number of cpus * @@ -177,7 +186,7 @@ * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = GetModified; +global boolean() AbortFunction = nil; /** * map of deafult values for options in UI @@ -209,12 +218,6 @@ global map KDUMP_SETTINGS = $[]; /** - * time for progress bar - * - */ -integer sl = 500; - -/** * Abort function * @return boolean return true if abort */ @@ -523,6 +526,33 @@ /** + * Check if default boot section is Xen section + * remember position of section (important for saving to xen_append) + * @param string name of section + */ + +define void CheckXenDefault(string act_boot_secion) +{ + if ((act_boot_secion != "") && (act_boot_secion != nil)) + { + integer section_position = -1; + foreach(map section, BootCommon::sections, + { + section_position = section_position +1; + string name = tostring(section["name"]:nil); + string type = tostring(section["type"]:nil); + if ((name == act_boot_secion) && (type == "xen")) + { + section_pos = section_position; + y2milestone("default boot section is Xen..."); + } + }); + if (section_pos == -1) + y2milestone("default boot section is NOT Xen..."); + } +} + +/** * Read current kdump configuration * from XEN boot section * read kernel parameter "crashkernel" @@ -618,9 +648,6 @@ crashkernel_param_value = result; if (result != "false") alocated_memory = getAlocatedMemory(crashkernel_param_value); - //alocated_memory = substring(result,0,search(result,"M")); //FIXME get alocated memory need to be fixed - - //Popup::Message(alocated_memory); return true; } @@ -645,12 +672,6 @@ return true; } - - - - - - /** * Read available memory * @@ -685,8 +706,6 @@ - - /** * Read current kdump configuration * @@ -701,13 +720,12 @@ map debug_KDUMP_SETTINGS = KDUMP_SETTINGS; + // delete KDUMP_SAVEDIR - it can include password debug_KDUMP_SETTINGS["KDUMP_SAVEDIR"] = ""; y2milestone("-------------KDUMP_SETTINGS-------------------"); y2milestone("kdump configuration has been read without value \"KDUMP_SAVEDIR\": %1", debug_KDUMP_SETTINGS); y2milestone("---------------------------------------------"); - - return true; } @@ -720,12 +738,12 @@ */ boolean WriteKdumpSettings () { map debug_KDUMP_SETTINGS = KDUMP_SETTINGS; + // delete KDUMP_SAVEDIR - it can include password debug_KDUMP_SETTINGS["KDUMP_SAVEDIR"] = ""; y2milestone("-------------KDUMP_SETTINGS-------------------"); y2milestone("Writing kdump configuration without value \"KDUMP_SAVEDIR\": %1", debug_KDUMP_SETTINGS); y2milestone("---------------------------------------------"); - foreach (string option_key, string option_val, KDUMP_SETTINGS, { SCR::Write(add(.sysconfig.kdump, option_key), option_val); }); @@ -744,6 +762,13 @@ boolean WriteKdumpBootParameter () { boolean result = true; boolean old_progress = false; + if (Mode::installation()) + { + Bootloader::Read(); + actual_boot_section = Bootloader::getDefaultSection (); + y2milestone("Default boot section is %1", actual_boot_section); + CheckXenDefault(actual_boot_section); + } if (add_crashkernel_param) { string crash_value = BuildCrashkernelValue (); @@ -764,13 +789,12 @@ Progress::set (old_progress); // Popup::Message(crash_value); y2milestone("[kdump] (WriteKdumpBootParameter) adding chrashkernel option with value : %1", crash_value); - if (!Mode::commandline()) + if (Mode::normal()) Popup::Message(_("To apply changes a reboot is necessary.")); Service::Enable("kdump"); return result; } - // start kernel-kdump at boot Service::Enable("kdump"); @@ -784,7 +808,7 @@ old_progress = Progress::set (false); Bootloader::Write(); Progress::set (old_progress); - if (!Mode::commandline()) + if (Mode::normal()) Popup::Message(_("To apply changes a reboot is necessary.")); } Service::Disable("kdump"); @@ -806,7 +830,6 @@ /* Kdump read dialog caption */ string caption = _("Initializing kdump Configuration"); integer steps = 4; - //sleep(sl); Progress::New( caption, " ", steps, [ /* Progress stage 1/4 */ @@ -831,39 +854,33 @@ "" ); - //sleep(sl); // read database if(Abort()) return false; Progress::NextStage(); /* Error message */ if(!ReadKdumpSettings ()) Report::Error(_("Cannot read config file /etc/sysconfig/kdump")); - //sleep(sl); // read another database if(Abort()) return false; Progress::NextStep(); /* Error message */ if(!ReadDiskPartitions ()) Report::Error(_("Cannot read disk partitions.")); - //sleep(sl); // read another database if(Abort()) return false; Progress::NextStep(); /* Error message */ if(!ReadKdumpKernelParam ()) Report::Error(_("Cannot read kernel boot options.")); - //sleep(sl); // read another database if(Abort()) return false; Progress::NextStep(); /* Error message */ if(!ReadAvailableMemory ()) Report::Error(_("Cannot read available memory.")); - //sleep(sl); if(Abort()) return false; /* Progress finished */ Progress::NextStage(); - //sleep(sl); if(Abort()) return false; modified = false; @@ -882,7 +899,6 @@ //number of stages integer steps = 2; - sleep(sl); // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ @@ -906,25 +922,107 @@ Progress::NextStage(); /* Error message */ if(!WriteKdumpSettings ()) Report::Error (_("Cannot write settings.")); - sleep(sl); // write/delete bootloader option for kernel "crashkernel" if(Abort()) return false; Progress::NextStage (); /* Error message */ if(!WriteKdumpBootParameter ()) Report::Error (_("Adding crashkernel parameter to bootloader fault.")); - sleep(sl); if(Abort()) return false; /* Progress finished */ Progress::NextStage(); - sleep(sl); if(Abort()) return false; return true; } /** + * Adding necessary packages for installation + * + */ + +define void AddPackages() +{ + + if (Mode::installation()) + { + kdump_packages = add(kdump_packages, "kexec-tools"); + kdump_packages = add(kdump_packages, "yast2-kdump"); + if (Arch::ppc64()) + kdump_packages = add(kdump_packages, "kernel-kdump"); + else + kdump_packages = add(kdump_packages, "kdump"); + } +} + +/** + * Propose global variables once... + * after that remember user settings + */ + +define void ProposeGlobalVars() +{ + if (!propose_called) + { + // set adding boot option... + crashkernel_param = false; + add_crashkernel_param = true; + // added defualt settings + KDUMP_SETTINGS = DEFAULT_CONFIG; + } + propose_called = true; +} + + +/** + * Check if user enabled kdump + * if no deselect packages for installing + * if yes add necessary packages for installation + */ +global define void CheckPackages() +{ + // remove duplicates + kdump_packages = toset(kdump_packages); + if (!add_crashkernel_param) + { + y2milestone("deselect packages for installation: %1", kdump_packages); + boolean pkg_deselect = false; + foreach (string p, kdump_packages, + { + if (Pkg::IsSelected (p)) + { + Pkg::PkgNeutral (p); + pkg_deselect = true; + } + }); + if (pkg_deselect) + { + // if package was added in inst. proposal, I can't be sure + // that dependencies will be solved + Pkg::PkgSolve (false); + } + } else { + y2milestone("select packages for installation: %1", kdump_packages); + boolean pkg_added = false; + foreach (string p, kdump_packages, + { + if (!Pkg::IsSelected (p)) + { + Pkg::PkgInstall (p); + pkg_added = true; + } + }); + if (pkg_added) + { + // if package was added in inst. proposal, I can't be sure + // that dependencies will be solved + Pkg::PkgSolve (false); + } + } +} + +/** * Propose all kdump settings * */ @@ -932,22 +1030,21 @@ { y2milestone("Proposing new settings of kdump"); - // adding defualt settings - KDUMP_SETTINGS = DEFAULT_CONFIG; + // set available partitions... ReadDiskPartitions (); - //FIXME: IMO it should be in Write because after writing bootloader... - // read bootloader settings - Bootloader::Read(); - // set actual/defualt boot section - actual_boot_section = Bootloader::getDefaultSection (); - - // set adding boot option... - crashkernel_param = false; - add_crashkernel_param = false; + // set default values for global variables + ProposeGlobalVars(); // read available memory ReadAvailableMemory (); + + // add packages for installation + AddPackages(); + + // select packages for installation + CheckPackages(); + } /** * Create a textual summary and a list of unconfigured cards @@ -956,8 +1053,8 @@ global define list<string> Summary () { list<string> result = []; - result = add (result, sformat (_("Kdump status: %1"), (add_crashkernel_param ? _("disabled"):_("enabled")))); - if (!add_crashkernel_param ) + result = add (result, sformat (_("Kdump status: %1"), (add_crashkernel_param ? _("enabled") :_("disabled")))); + if (add_crashkernel_param ) { result = add (result, sformat (_("Value of crashkernel option: %1"), BuildCrashkernelValue())); result = add (result, sformat (_("Dump format: %1"), KDUMP_SETTINGS["KDUMP_DUMPFORMAT"]:"")); @@ -975,6 +1072,7 @@ { map out = $[ "crash_kernel" : BuildCrashkernelValue(), + "add_crash_kernel" : add_crashkernel_param, "general" : KDUMP_SETTINGS, ]; @@ -991,6 +1089,7 @@ global define boolean Import (map settings) { crashkernel_param_value = settings["crash_kernel"]:""; + add_crashkernel_param = settings["add_crash_kernel"]:false; boolean result = true; map my_import_map = settings["general"]:$[]; foreach (any key, Map::Keys(DEFAULT_CONFIG), Modified: trunk/kdump/src/kdump.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.desktop?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/src/kdump.desktop (original) +++ trunk/kdump/src/kdump.desktop Thu Jul 17 17:23:57 2008 @@ -12,10 +12,12 @@ X-SuSE-YaST-Group=System X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst= +X-SuSE-YaST-AutoInst=configure X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource= +X-SuSE-YaST-AutoInstPath=install +X-SuSE-YaST-AutoInstSchema=kdump.rnc Icon=yast-kdump Exec=/sbin/yast2 kdump Modified: trunk/kdump/src/kdump_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump_finish.ycp?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/src/kdump_finish.ycp (original) +++ trunk/kdump/src/kdump_finish.ycp Thu Jul 17 17:23:57 2008 @@ -17,7 +17,7 @@ import "Kdump"; import "Mode"; - +import "Progress"; any ret = nil; string func = ""; @@ -30,6 +30,8 @@ param = (map)WFM::Args(1); } +boolean progress_orig = Progress::set (false); + y2milestone ("starting kdump_finish"); y2debug("func=%1", func); y2debug("param=%1", param); @@ -52,7 +54,7 @@ y2error ("unknown function: %1", func); ret = nil; } - +Progress::set (progress_orig); y2debug("ret=%1", ret); y2milestone("kdump_finish finished"); return ret; Modified: trunk/kdump/src/kdump_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump_proposal.ycp?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/src/kdump_proposal.ycp (original) +++ trunk/kdump/src/kdump_proposal.ycp Thu Jul 17 17:23:57 2008 @@ -41,11 +41,11 @@ if ( func == "MakeProposal" ) { Kdump::Propose(); + ret = $[ "raw_proposal" : Kdump::Summary ()]; } else if ( func == "AskUser" ) { boolean has_next = param["has_next"]:false; - y2milestone("I don't know..."); map settings = Kdump::Export (); Kdump::modified = false; any result = KdumpAutoSequence (); @@ -53,6 +53,8 @@ if (result != `next) Kdump::Import ((map)settings); + // if disable kdump deselect packages for installation + // Kdump::CheckPackages(); // Fill return map ret = $[ "workflow_sequence" : result ]; } @@ -70,10 +72,12 @@ } else if (func == "Write") { - boolean succ = Kdump::Write (); + // Write is called in finish script (kdump_finish.ycp) + // it is necessary do it after bootloader write his settings + // boolean succ = Kdump::Write (); ret = $[ - "success" : succ + "success" : true ]; } Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Thu Jul 17 17:23:57 2008 @@ -16,7 +16,7 @@ import "Service"; import "Package"; import "PackageSystem"; - +import "Mode"; // EXAMPLE FUNCTIONS /* @@ -148,12 +148,21 @@ * Function initializes option "Enable/Disable kdump" */ void InitEnableDisalbeKdump (string key) { - if ((Kdump::add_crashkernel_param) && (Service::Status("kdump")==0)) { - UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"enable_kdump"); + + if (Mode::installation()) + { + if (Kdump::add_crashkernel_param) + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"enable_kdump"); + else + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"disable_kdump"); } else { - UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"disable_kdump"); - } + if ((Kdump::add_crashkernel_param) && (Service::Status("kdump") == 0 )) + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"enable_kdump"); + else + UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"disable_kdump"); + } + } /** @@ -511,11 +520,18 @@ } else if (radiobut == "cifs") { // fix for bnc #307307 module should check if cifs tools are installed when requested - if (!Package::Installed("cifs-mount")) + if (Mode::installation() ||Mode::autoinst() ) { - y2milestone("SMB/CIFS share cannot be mounted, installing missing 'cifs-mount' package..."); - // install cifs-mount package - PackageSystem::CheckAndInstallPackages(["cifs-mount"]); + Kdump::kdump_packages = add(Kdump::kdump_packages, "cifs-mount"); + y2milestone("add cifs-mount to selected packages to installation"); + + } else { + if (!Package::Installed("cifs-mount")) + { + y2milestone("SMB/CIFS share cannot be mounted, installing missing 'cifs-mount' package..."); + // install cifs-mount package + PackageSystem::CheckAndInstallPackages(["cifs-mount"]); + } } value = tostring(UI::QueryWidget(`id ("server"), `Value)); @@ -857,8 +873,6 @@ } - - /** * Function stores option * "Enable Raw Saving in Initrd" @@ -881,12 +895,6 @@ } - - - - - - /** * Function initializes option "Kdump Command Line" * @@ -1095,25 +1103,34 @@ if ((dumplevel > 0 ) || (dumplevel == nil)) { - if (Package::Installed("makedumpfile")) { - return true; - } else { - list <string> package_list = []; - package_list = add(package_list, "makedumpfile"); + if (Mode::installation() ||Mode::autoinst() ) + { + Kdump::kdump_packages = add(Kdump::kdump_packages, "makedumpfile"); + y2milestone("add makedumpfile to selected packages to installation"); - if (!PackageSystem::CheckAndInstallPackages(package_list)) { - result = false; + } else { + if (Package::Installed("makedumpfile")) { + return true; + } else { + list <string> package_list = []; + package_list = add(package_list, "makedumpfile"); - if (!Mode::commandline()) { - Popup::Error(Message::CannotContinueWithoutPackagesInstalled()); + if (!PackageSystem::CheckAndInstallPackages(package_list)) + { + result = false; + + if (!Mode::commandline()) + { + Popup::Error(Message::CannotContinueWithoutPackagesInstalled()); + } else { + CommandLine::Error(Message::CannotContinueWithoutPackagesInstalled()); + } + y2error("[kdump] (ValidDumpLevel) Installation of package list %1 failed or aborted", package_list); } else { - CommandLine::Error(Message::CannotContinueWithoutPackagesInstalled()); + result = true; } - y2error("[kdump] (ValidDumpLevel) Installation of package list %1 failed or aborted", package_list); - } else { - result = true; - } - } //end of else for if (Package::Installed("makedumpfile")) + } //end of else for if (Package::Installed("makedumpfile")) + } } //end of if ((dumplevel >0 ) || (dumplevel == nil)) return result; } @@ -1168,11 +1185,6 @@ return nil; } - - - - - /** * Function initializes option * "KdumpMemory" @@ -1214,7 +1226,6 @@ } - /** * Function validates if crashkernel option includes * several ranges and ask user about rewritting @@ -1289,25 +1300,34 @@ if ((value != "elf_format") || (value == nil)) { - if (Package::Installed("makedumpfile")) { - return true; - } else { - list <string> package_list = []; - package_list = add(package_list, "makedumpfile"); + if (Mode::installation() || Mode::autoinst() ) + { + Kdump::kdump_packages = add(Kdump::kdump_packages, "makedumpfile"); + y2milestone("add makedumpfile to selected packages to installation"); - if (!PackageSystem::CheckAndInstallPackages(package_list)) { - result = false; + } else { + if (Package::Installed("makedumpfile")) { + return true; + } else { + list <string> package_list = []; + package_list = add(package_list, "makedumpfile"); - if (!Mode::commandline()) { - Popup::Error(Message::CannotContinueWithoutPackagesInstalled()); + if (!PackageSystem::CheckAndInstallPackages(package_list)) + { + result = false; + + if (!Mode::commandline()) + { + Popup::Error(Message::CannotContinueWithoutPackagesInstalled()); + } else { + CommandLine::Error(Message::CannotContinueWithoutPackagesInstalled()); + } + y2error("[kdump] (ValidDumpFormat) Installation of package list %1 failed or aborted", package_list); } else { - CommandLine::Error(Message::CannotContinueWithoutPackagesInstalled()); + result = true; } - y2error("[kdump] (ValidDumpLevel) Installation of package list %1 failed or aborted", package_list); - } else { - result = true; - } - } //end of else for if (Package::Installed("makedumpfile")) + } //end of else for if (Package::Installed("makedumpfile")) + } } //end of if ((value != "elf_format") || (value == nil)) return result; } @@ -1361,8 +1381,6 @@ } } - - } @@ -1377,8 +1395,6 @@ Kdump::KDUMP_SETTINGS["KDUMP_KEEP_OLD_DUMPS"] = "0"; } - - } /* EOF */ Modified: trunk/kdump/yast2-kdump.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/yast2-kdump.spec.in?rev=49228&r1=49227&r2=49228&view=diff ============================================================================== --- trunk/kdump/yast2-kdump.spec.in (original) +++ trunk/kdump/yast2-kdump.spec.in Thu Jul 17 17:23:57 2008 @@ -25,7 +25,9 @@ %dir @yncludedir@/kdump @yncludedir@/kdump/* @clientdir@/kdump.ycp +@clientdir@/kdump_*.ycp @moduledir@/Kdump.* @desktopdir@/kdump.desktop +@schemadir@/autoyast/rnc/kdump.rnc @scrconfdir@/*.scr %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org