Author: juhliarik Date: Thu Aug 9 17:50:48 2007 New Revision: 40143 URL: http://svn.opensuse.org/viewcvs/yast?rev=40143&view=rev Log: added commandline interface and corrections Removed: trunk/kdump/src/kdump_auto.ycp trunk/kdump/src/kdump_proposal.ycp Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/Makefile.am trunk/kdump/src/complex.ycp trunk/kdump/src/kdump.ycp trunk/kdump/src/uifunctions.ycp trunk/kdump/src/wizards.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Aug 9 17:50:48 2007 @@ -46,6 +46,7 @@ import "Service"; import "Popup"; import "Arch"; +import "Mode"; /** * Prototypes @@ -145,7 +146,7 @@ "KDUMP_RUNLEVEL" : "1", "KDUMP_IMMEDIATE_REBOOT" : "yes", "KDUMP_TRANSFER" : "", - "KDUMP_SAVEDIR" : "/var/log/dump", + "KDUMP_SAVEDIR" : "file:///var/log/dump", "KDUMP_KEEP_OLD_DUMPS" : "5", "KDUMP_FREE_DISK_SIZE" : "64", "KDUMP_DUMPDEV" : "", @@ -271,7 +272,7 @@ crashkernel_param_value = result; if (result != "false") - alocated_memory = substring(result,0,find(result,"@")); + alocated_memory = substring(result,0,search(result,"@")); //Popup::Message(alocated_memory); @@ -371,7 +372,8 @@ } else if (Arch::ppc64()) { crash_value = crash_value + "32M"; } else { - Popup::Error("Unsupported architecture, \"crashkernel\" was not added"); + if (!Mode::commandline()) + Popup::Error(_("Unsupported architecture, \"crashkernel\" was not added")); return false; } @@ -380,7 +382,8 @@ //Popup::Message(Bootloader::getDefaultSection ()); result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", crash_value); // //Popup::Message(crash_value); - Popup::Message("For applying changes is necessary reboot."); + if (!Mode::commandline()) + Popup::Message(_("For applying changes is necessary reboot.")); return result; } @@ -392,7 +395,8 @@ if (crashkernel_param) { //delete crashkernel paramter from bootloader result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", "false"); - Popup::Message("For applying changes is necessary reboot."); + if (!Mode::commandline()) + Popup::Message(_("For applying changes is necessary reboot.")); } Service::Disable("kernel-kdump"); return result; @@ -484,23 +488,22 @@ /* Kdump read dialog caption */ string caption = _("Saving kdump Configuration"); - // TODO FIXME And set the right number of stages + //number of stages integer steps = 2; sleep(sl); - // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/2 */ _("Write the settings"), /* Progress stage 2/2 */ - _("Run SuSEconfig") + _("Update boot options") ], [ /* Progress step 1/2 */ _("Writing the settings..."), /* Progress step 2/2 */ - _("Running SuSEconfig..."), + _("Updating boot options..."), /* Progress finished */ _("Finished") ], @@ -514,7 +517,7 @@ if(!WriteKdumpSettings ()) Report::Error (_("Cannot write settings.")); sleep(sl); - // run SuSEconfig + // write/delete bootloader option for kernel "crashkernel" if(Abort()) return false; Progress::NextStage (); /* Error message */ @@ -530,56 +533,5 @@ return true; } -/** - * Get all kdump settings from the first parameter - * (For use by autoinstallation.) - * @param settings The YCP structure to be imported. - * @return boolean True on success - */ -global boolean Import (map settings) { - // TODO FIXME: your code here (fill the above mentioned variables)... - return true; -} - -/** - * Dump the kdump settings to a single map - * (For use by autoinstallation.) - * @return map Dumped settings (later acceptable by Import ()) - */ -global map Export () { - // TODO FIXME: your code here (return the above mentioned variables)... - return $[]; -} - -/** - * Create a textual summary and a list of unconfigured cards - * @return summary of the current configuration - */ -global list Summary() { - // TODO FIXME: your code here... - /* Configuration summary text for autoyast */ - return [ _("Configuration summary..."), [] ]; -} - -/** - * Create an overview table with all configured cards - * @return table items - */ -global list Overview() { - // TODO FIXME: your code here... - return []; -} - -/** - * Return packages needed to be installed and removed during - * Autoinstallation to insure module has all needed software - * installed. - * @return map with 2 lists. - */ -global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; -} - /* EOF */ } Modified: trunk/kdump/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Makefile.am?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/Makefile.am (original) +++ trunk/kdump/src/Makefile.am Thu Aug 9 17:50:48 2007 @@ -3,9 +3,7 @@ yncludedir = @yncludedir@/kdump client_DATA = \ - kdump.ycp \ - kdump_auto.ycp \ - kdump_proposal.ycp + kdump.ycp ynclude_DATA = \ helps.ycp \ Modified: trunk/kdump/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/complex.ycp?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/complex.ycp (original) +++ trunk/kdump/src/complex.ycp Thu Aug 9 17:50:48 2007 @@ -88,13 +88,14 @@ kdump_available = Package::Available("kernel-kdump"); if ((!kexec_installed) &&(!kexec_available)) { - Popup::Error("Package for kexec-tools is not available."); + + Popup::Error(_("Package for kexec-tools is not available.")); y2error("[kdump] (ReadDialog ()) Packages for kexec-tools is not available."); return `abort; } if ((!kdump_installed) &&(!kdump_available)) { - Popup::Error("Package for kernel-kdump is not available."); + Popup::Error(_("Package for kernel-kdump is not available.")); y2error("[kdump] (ReadDialog ()) Packages for kernel-kdump is not available."); return `abort; } @@ -108,7 +109,7 @@ //install packages if (!Package::DoInstall(package_list)) { - Popup::Error("Installation failed!"); + Popup::Error(_("Installation failed!")); y2error("[kdump] Installation of package list %1 failed", package_list); return `abort; } @@ -132,126 +133,5 @@ return ret ? `next : `abort; } -/** - * Summary dialog - * @return dialog result - */ -any SummaryDialog() { - - /* Kdump summary dialog caption */ - string caption = _("Kdump Configuration"); - - /* FIXME */ - list summary = Kdump::Summary(); - list unconfigured = summary[1]:[]; - string configured = summary[0]:""; - - /* Frame label */ - term contents = Wizard_hw::DetectedContent(_("Kdump to Configure"), - unconfigured, false, configured); - - Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", - Label::BackButton(), Label::FinishButton()); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - /* abort? */ - if(ret == `abort || ret == `cancel || ret == `back) { - if(ReallyAbort()) break; - else continue; - } - /* overview dialog */ - else if(ret == `edit_button) { - ret = `overview; - break; - } - /* configure the selected device */ - else if(ret == `configure_button) { - // TODO FIXME: check for change of the configuration - any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem); - if(selected == `other) { - ret = `other; - } - else { - ret = `configure; - } - break; - } - else if(ret == `next) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} - -/** - * Overview dialog - * @return dialog result - */ -any OverviewDialog() { - - /* Kdump overview dialog caption */ - string caption = _("Kdump Overview"); - - list overview = Kdump::Overview(); - - /* FIXME table header */ - term contents = Wizard_hw::ConfiguredContent( - /* Table header */ - `header(_("Number"), _("Kdump")), - overview, nil, nil, nil, nil ); - - contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); - - Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", - Label::BackButton(), Label::FinishButton()); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } - /* add */ - else if(ret == `add_button) { - /* FIXME */ - ret = `add; - break; - } - /* edit */ - else if(ret == `edit_button) { - /* FIXME */ - ret = `edit; - break; - } - /* delete */ - else if(ret == `delete_button) { - /* FIXME */ - continue; - } - else if(ret == `next || ret == `back) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} - /* EOF */ } Modified: trunk/kdump/src/kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.ycp?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/kdump.ycp (original) +++ trunk/kdump/src/kdump.ycp Thu Aug 9 17:50:48 2007 @@ -44,25 +44,824 @@ import "Progress"; import "Report"; import "Summary"; +import "Popup"; +import "String"; +import "FileUtils"; import "CommandLine"; include "kdump/wizards.ycp"; +include "kdump/uifunctions.ycp"; + +/** + * Command line function for display options from kdump + * + */ +boolean cmdKdumpShow (map options) { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(String::UnderlinedHeader(_("Display Settings:"), 0)); + CommandLine::Print(""); + if (Kdump::crashkernel_param) { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("Kdump is enabled (boot option \"crashkernel\" is added)")); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Alocate memory (MB) for kdump is: %1"), Kdump::alocated_memory)); + + } else { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("Kdump is disable")); + } + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Dump Level: %1"), Kdump::KDUMP_SETTINGS["KDUMP_DUMPLEVEL"]:nil)); + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Dump Format: %1"), Kdump::KDUMP_SETTINGS["KDUMP_DUMPFORMAT"]:nil)); + CommandLine::Print(""); + + // parsing target info + CommandLine::Print(_("Dump Target Settings")); + if (SetUpKDUMP_SAVE_TARGET(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil)) { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("target: %1"), KDUMP_SAVE_TARGET["target"]:nil)); + + //local filesystem + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("file directory: %1"), KDUMP_SAVE_TARGET["dir"]:nil)); + + //ftp target + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("server name: %1"),KDUMP_SAVE_TARGET["server"]:nil)); + + if (KDUMP_SAVE_TARGET["port"]:nil != "") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("port: %1"), KDUMP_SAVE_TARGET["port"]:nil)); + } + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("file directory: %1"), KDUMP_SAVE_TARGET["dir"]:nil)); + + if ((KDUMP_SAVE_TARGET["user_name"]:nil == "") || + (KDUMP_SAVE_TARGET["user_name"]:nil == "anonymous")) { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("user name: anonymous connection is allowed")); + } else { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("user name: %1"),KDUMP_SAVE_TARGET["user_name"]:nil)); + } + + //ssh connection + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("server name: %1"), KDUMP_SAVE_TARGET["server"]:nil)); + + + if (KDUMP_SAVE_TARGET["port"]:nil != "") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("port: %1"), KDUMP_SAVE_TARGET["port"]:nil)); + } + + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("file directory: %1"), KDUMP_SAVE_TARGET["dir"]:nil)); + + if ((KDUMP_SAVE_TARGET["user_name"]:nil != "") && + (KDUMP_SAVE_TARGET["user_name"]:nil != "anonymous")) { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("user name: %1"),KDUMP_SAVE_TARGET["user_name"]:nil)); + } + + // nfs target + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("server name: %1"), KDUMP_SAVE_TARGET["server"]:nil)); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("file directory: %1"), KDUMP_SAVE_TARGET["dir"]:nil)); + + //cifs target + } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("server name: %1"), KDUMP_SAVE_TARGET["server"]:nil)); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("file directory: %1"), KDUMP_SAVE_TARGET["dir"]:nil)); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("share: %1"),KDUMP_SAVE_TARGET["share"]:nil)); + + if ((KDUMP_SAVE_TARGET["user_name"]:nil == "") || + (KDUMP_SAVE_TARGET["user_name"]:nil == "anonymous")) { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("user name: anonymous connection is allowed")); + } else { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("user name: %1"),KDUMP_SAVE_TARGET["user_name"]:nil)); + } + + + } + } else { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("EMPTY")); + + + } //end of if (SetUpKDUMP_SAVE_TARGET(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil)) + + if (Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil != "") { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Save first to raw partition: %1"), Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil)); + } + + if (Kdump::KDUMP_SETTINGS["KDUMP_KERNELVER"]:nil != "") { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Custom kdump kernel: %1"), Kdump::KDUMP_SETTINGS["KDUMP_KERNELVER"]:nil)); + } + + if (Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE"]:nil != "") { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Kdump command line: %1"), Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE"]:nil)); + } + + if (Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE_APPEND"]:nil != "") { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Kdump command line append: %1"), Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE_APPEND"]:nil)); + + } + + if (Kdump::KDUMP_SETTINGS["KDUMP_RUNLEVEL"]:nil != "") { + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Kdump runlevel: %1"), Kdump::KDUMP_SETTINGS["KDUMP_RUNLEVEL"]:nil)); + } + + + CommandLine::Print(""); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Kdump immediate reboots: %1"),(Kdump::KDUMP_SETTINGS["KDUMP_IMMEDIATE_REBOOT"]:nil == "yes") ? _("ENABLED"):_("DISABLED") )); + + CommandLine::Print(""); + + if (Kdump::KDUMP_SETTINGS["KDUMP_KEEP_OLD_DUMPS"]:nil == "0") { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("Numbers of old dumps: All dumps are saved without deleting old dumps")); + } else { + //TRANSLATORS: CommandLine printed text + CommandLine::Print(sformat(_("Numbers of old dumps: %1"),Kdump::KDUMP_SETTINGS["KDUMP_KEEP_OLD_DUMPS"]:nil)); + } + CommandLine::Print(""); + + + return true; +} + + + +boolean cmdKdumpStartup (map options) { + + if ((options["enable"]:nil!=nil) && (options["alloc_mem"]:nil!=nil)) { + Kdump::add_crashkernel_param = true; + Kdump::alocated_memory = tostring(options["alloc_mem"]:nil); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("For applying changes is necessary reboot.")); + return true; + + } else if (options["disable"]:nil!=nil) { + Kdump::add_crashkernel_param = false; + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("For applying changes is necessary reboot.")); + return true; + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + +boolean cmdKdumpDumpLevel (map options) { + if (options["dump_level"]:nil!=nil) { + + if ((options["dump_level"]:nil < 32) && (options["dump_level"]:nil >-1)) { + Kdump::KDUMP_SETTINGS["KDUMP_DUMPLEVEL"] = tostring(options["dump_level"]:nil); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("Dump level was set.")); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value of option.")); + return false; + } + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + +boolean cmdKdumpDumpFormat (map options) { + if (options["dump_format"]:nil!=nil) { + + if ((options["dump_format"]:nil == "ELF") || (options["dump_format"]:nil == "compressed")) { + Kdump::KDUMP_SETTINGS["KDUMP_DUMPFORMAT"] = tostring(options["dump_format"]:nil); + //TRANSLATORS: CommandLine printed text + CommandLine::Print(_("Dump format was set.")); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value of option.")); + //TRANSLATORS: CommandLine printed text help + CommandLine::Print(_("Option can include only \"ELF\" or \"compressed\" value.")); + return false; + } + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + + +} + +string cmdParsePassPath (string path_file) { + string password = nil; + if (FileUtils::IsFile(path_file)) { + password = (string)SCR::Read(.target.string, path_file); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(sformat(_("File %1 doesn't exist."),path_file)); + } + return password; +} + + +boolean cmdKdumpDumpTarget (map options) { + if (options["target"]:nil!=nil) { + string target = tostring(options["target"]:nil); + switch(target) { + + case("file"): + KDUMP_SAVE_TARGET["target"] = "file"; + if (options["dir"]:nil!=nil) { + KDUMP_SAVE_TARGET["dir"] = tostring(options["dir"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"dir\" missing.")); + return false; + } + break; + + case("ftp"): + KDUMP_SAVE_TARGET["target"] = "ftp"; + + if (options["server"]:nil!=nil) { + KDUMP_SAVE_TARGET["server"] = tostring(options["server"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"server\" missing.")); + return false; + } + + if (options["port"]:nil!=nil) + KDUMP_SAVE_TARGET["port"] = tostring(options["port"]:nil); + + if (options["dir"]:nil!=nil) { + KDUMP_SAVE_TARGET["dir"] = tostring(options["dir"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"dir\" missing.")); + return false; + } + + if (options["user"]:nil!=nil) + KDUMP_SAVE_TARGET["user_name"] = tostring(options["user"]:nil); + + if (options["pass"]:nil!=nil) { + string password = cmdParsePassPath(tostring(options["pass"]:nil)); + if ((password == nil) || (password == "")) + return false; + KDUMP_SAVE_TARGET["password"] = password; + } + break; + + case("ssh"): + KDUMP_SAVE_TARGET["target"] = "ssh"; + + if (options["server"]:nil!=nil) { + KDUMP_SAVE_TARGET["server"] = tostring(options["server"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"server\" missing.")); + return false; + } + + if (options["port"]:nil!=nil) + KDUMP_SAVE_TARGET["port"] = tostring(options["port"]:nil); + + if (options["dir"]:nil!=nil) { + KDUMP_SAVE_TARGET["dir"] = tostring(options["dir"]:nil); + } else { + CommandLine::Error(_("Value for \"dir\" missing.")); + return false; + } + + if (options["user"]:nil!=nil) + KDUMP_SAVE_TARGET["user_name"] = tostring(options["user"]:nil); + + break; + + case("nfs"): + + KDUMP_SAVE_TARGET["target"] = "nfs"; + + if (options["server"]:nil!=nil) { + KDUMP_SAVE_TARGET["server"] = tostring(options["server"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"server\" missing.")); + return false; + } + + if (options["dir"]:nil!=nil) { + KDUMP_SAVE_TARGET["dir"] = tostring(options["dir"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"dir\" missing.")); + return false; + } + + break; + + case("cifs"): + KDUMP_SAVE_TARGET["target"] = "cifs"; + + if (options["server"]:nil!=nil) { + KDUMP_SAVE_TARGET["server"] = tostring(options["server"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"server\" missing.")); + return false; + } + + if (options["share"]:nil!=nil) { + KDUMP_SAVE_TARGET["share"] = tostring(options["share"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"share\" missing.")); + return false; + } + + + if (options["port"]:nil!=nil) + KDUMP_SAVE_TARGET["port"] = tostring(options["port"]:nil); + + if (options["dir"]:nil!=nil) { + KDUMP_SAVE_TARGET["dir"] = tostring(options["dir"]:nil); + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Value for \"dir\" missing.")); + return false; + } + + if (options["user"]:nil!=nil) + KDUMP_SAVE_TARGET["user_name"] = tostring(options["user"]:nil); + + if (options["pass"]:nil!=nil) { + string password = cmdParsePassPath(tostring(options["pass"]:nil)); + if ((password == nil) || (password == "")) + return false; + KDUMP_SAVE_TARGET["password"] = password; + } + break; + + default: + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value for target.")); + return false; + break; + } + Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]= tostringKDUMP_SAVE_TARGET(); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + + +boolean cmdKdumpRawPartition (map options) { + if (options["raw"]:nil!=nil) { + + string value = tostring(find(string key, Kdump::uknown_fs_partitions, + ``(search(key, tostring(options["raw"]:nil)) != nil))); + + if ((value != "") && (value != nil)) { + Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"] = tostring(options["raw"]:nil); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value of options \"raw\". Partition doesn't exist.")); + return false; + } + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + + +} + +boolean cmdKdumpCustomKernel (map options) { + + if (options["kernel"]:nil!=nil) { + Kdump::KDUMP_SETTINGS["KDUMP_KERNELVER"] = tostring(options["kernel"]:nil); + return true; + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + +boolean cmdKdumpKernelCommandLine (map options) { + if (options["command"]:nil!=nil) { + Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE"] = tostring(options["command"]:nil); + return true; + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + +boolean cmdKdumpKernelCommandLineAppend (map options) { + if (options["command"]:nil!=nil) { + Kdump::KDUMP_SETTINGS["KDUMP_COMMANDLINE_APPEND"] = tostring(options["command"]:nil); + return true; + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + +boolean cmdKdumpImmediateReboot (map options) { + if (options["enable"]:nil!=nil) { + Kdump::KDUMP_SETTINGS["KDUMP_IMMEDIATE_REBOOT"]="yes"; + return true; + + } else if (options["disable"]:nil!=nil) { + Kdump::KDUMP_SETTINGS["KDUMP_IMMEDIATE_REBOOT"]="no"; + return true; + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + +boolean cmdKdumpRunLevel (map options) { + if (options["level"]:nil!=nil) { + string level = filterchars(tostring(options["level"]:nil),"1235s"); + + if ((level != "") && (level != nil)){ + Kdump::KDUMP_SETTINGS["KDUMP_RUNLEVEL"]= tostring(options["level"]:nil); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value of options \"level\".")); + return false; + } + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + +boolean cmdKdumpKeepOldDumps (map options) { + if (options["no"]:nil!=nil) { + + if (options["no"]:nil > -1){ + Kdump::KDUMP_SETTINGS["KDUMP_KEEP_OLD_DUMPS"]= tostring(options["no"]:nil); + return true; + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong value of options \"no\".")); + return false; + } + + } else { + // TRANSLATORS: CommandLine error message + CommandLine::Error(_("Wrong options was used.")); + return false; + } + +} + + map cmdline_description = $[ "id" : "kdump", - /* Command line help text for the Xkdump module */ + /* Command line help text for the kdump module */ "help" : _("Configuration of kdump"), "guihandler" : KdumpSequence, "initialize" : Kdump::Read, "finish" : Kdump::Write, "actions" : $[ - // FIXME TODO: fill the functionality description here + + "show" : $[ + "handler" : cmdKdumpShow, + // TRANSLATORS: CommandLine help + "help" : _("Display settings"), + "example" : [ + "show", + ], + ], + + "startup" : $[ + "handler" : cmdKdumpStartup, + // TRANSLATORS: CommandLine help + "help" : _("Start-up settings"), + "example" : [ + "startup enable alloc_mem=256", + "startup disable", + ], + ], + + "dumplevel" : $[ + "handler" : cmdKdumpDumpLevel, + // TRANSLATORS: CommandLine help + "help" : _("Dump Level number 0-31"), + "example" : [ + "dumplevel dump_level=24", + ], + ], + + + "dumpformat" : $[ + "handler" : cmdKdumpDumpFormat, + // TRANSLATORS: CommandLine help + "help" : _("Dump format for dump image ELF/compressed"), + "example" : [ + "dumpformat dump_format=ELF", + "dumpformat dump_format=compressed", + ], + ], + + "dumptarget" : $[ + "handler" : cmdKdumpDumpTarget, + // TRANSLATORS: CommandLine help + "help" : _("Dump target includes destination for saving dump images"), + "example" : [ + "dumptarget taget=file dir=/var/log/dump", + "dumptarget taget=ftp server=name_server port=21 dir=/var/log/dump user=user_name pass=path_to_file_with_password", + "dumptarget taget=ssh server=name_server port=22 dir=/var/log/dump user=user_name", + "dumptarget taget=nfs server=name_server dir=/var/log/dump", + "dumptarget taget=cifs server=name_server share=share_name dir=/var/log/dump user=user_name pass=path_to_file_with_password", + ], + ], + + "rawpartition" : $[ + "handler" : cmdKdumpRawPartition, + // TRANSLATORS: CommandLine help + "help" : _("Raw partition allows to save the dump in initrd before mounting any filesystem."), + "example" : [ + "rawpartition raw=scsi-SATA_ST3200827AS_5ND4TNCS-part2", + ], + ], + + "customkernel" : $[ + "handler" : cmdKdumpCustomKernel, + // TRANSLATORS: CommandLine help + "help" : _("The naming scheme is:/boot/vmlinu[zx]-[.gz] Please eneter only \"kernel_string\"."), + "example" : [ + "customkernel kernel=kdump", + ], + ], + + "kernelcommandline" : $[ + "handler" : cmdKdumpKernelCommandLine, + // TRANSLATORS: CommandLine help + "help" : _("The kdump commandline is the command line that needs to be passed off to the kdump kernel."), + "example" : [ + "kernelcommandline command=\"ro root=LABEL=/\"", + ], + ], + + "kernelcommandlineappend" : $[ + "handler" : cmdKdumpKernelCommandLineAppend, + // TRANSLATORS: CommandLine help + "help" : _("Set this variable if you only want to _append_ values to the default command line string."), + "example" : [ + "kernelcommandlineapped command=\"ro root=LABEL=/\"", + ], + ], + + "immediatereboot" : $[ + "handler" : cmdKdumpImmediateReboot, + // TRANSLATORS: CommandLine help + "help" : _("Immediately reboot after saving the core in the kdump kernel."), + "example" : [ + "immediatereboot enable", + "immediatereboot disable", + ], + ], + + "runlevel" : $[ + "handler" : cmdKdumpRunLevel, + // TRANSLATORS: CommandLine help + "help" : _("The run-level to boot the kdump kernel.(1,2,3,5,s)"), + "example" : [ + "runlevel level=1", + ], + ], + + "keepolddumps" : $[ + "handler" : cmdKdumpKeepOldDumps, + // TRANSLATORS: CommandLine help + "help" : _("Specifies how many old dumps are kept. 0 means keep all."), + "example" : [ + "keepolddumps no=5", + ], + ], + ], "options" : $[ - // FIXME TODO: fill the option descriptions here + "enable": $[ + // TRANSLATORS: CommandLine help + "help" : _("Enable option"), + ], + + "disable": $[ + // TRANSLATORS: CommandLine help + "help" : _("Disable option"), + ], + + "alloc_mem": $[ + "type" : "integer", + // TRANSLATORS: CommandLine help + "help" : _("Size of allocate memory MB"), + ], + + "dump_level": $[ + "type" : "integer", + // TRANSLATORS: CommandLine help + "help" : _("Number for dump level includes pages for saving"), + ], + + "dump_format": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Dump format can be ELF or compressed"), + ], + + "target": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Dump target includes kind of target from: file (local filesystem), ftp, ssh, nfs, cifs"), + ], + + "server": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Name of server"), + ], + + "port": $[ + "type" : "integer", + // TRANSLATORS: CommandLine help + "help" : _("Port for connection"), + ], + + "dir": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Directory for saving dumps images"), + ], + + "share": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Exported share"), + ], + + "user": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("User name"), + ], + + "pass": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Path of file which includes passwort (plain text file)"), + ], + + "raw": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("udev_id of raw partition"), + ], + + "kernel": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means only \"kernel_string\"."), + ], + + "command": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Include command line options."), + ], + + + "level": $[ + "type" : "string", + // TRANSLATORS: CommandLine help + "help" : _("Option means run-level to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed"), + ], + + "no": $[ + "type" : "integer", + // TRANSLATORS: CommandLine help + "help" : _("Number of dumps. 0 means keep all."), + ], + ], "mappings" : $[ - // FIXME TODO: fill the mappings of actions and options here + "show" : [ + ], + + "startup" : [ + "enable", "disable", "alloc_mem", + ], + + "dumplevel" : [ + "dump_level", + ], + + "dumpformat" : [ + "dump_format", + ], + + "dumptarget": [ + "target", "server", "port", "share", "dir", "user", "pass", + ], + + "rawpartition": [ + "raw", + ], + + "customkernel": [ + "kernel", + ], + + "kernelcommandline": [ + "command", + ], + + "kernelcommandlineappend": [ + "command", + ], + + "immediatereboot": [ + "enable", "disable", + ], + + "runlevel": [ + "level", + ], + + "keepolddumps": [ + "no", + ], + + ] ]; @@ -79,7 +878,11 @@ /* main ui function */ any ret = nil; -if(propose) ret = KdumpAutoSequence(); +if (propose) { + //ret = KdumpAutoSequence(); + Popup::Error("AutoYaST is not supported"); + ret = `abort; +} else ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Thu Aug 9 17:50:48 2007 @@ -172,28 +172,28 @@ string parse_target = target; if (target != "") { - integer pos = find(parse_target, "/"); + integer pos = search(parse_target, "/"); integer pos1 = -1; KDUMP_SAVE_TARGET["target"]=substring(parse_target,0,pos-1); parse_target = substring(parse_target,pos+2); if (KDUMP_SAVE_TARGET["target"]:nil == "file") { KDUMP_SAVE_TARGET["dir"]=parse_target; } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { - pos = find(parse_target, "/"); + pos = search(parse_target, "/"); //pos1 = pos; KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); //pos = find(parse_target, "/"); //KDUMP_SAVE_TARGET["share"]=substring(parse_target,pos1+1,pos-(pos1+1)); KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { - pos = find(parse_target, "@"); - if (pos != -1) { + pos = search(parse_target, "@"); + if (pos != nil) { KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); parse_target = substring(parse_target,pos+1); } - pos1 = find(parse_target, ":"); - pos = find(parse_target, "/"); - if (pos1 !=-1) { + pos1 = search(parse_target, ":"); + pos = search(parse_target, "/"); + if (pos1 != nil) { KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); } else { @@ -203,22 +203,22 @@ } else if ((KDUMP_SAVE_TARGET["target"]:nil == "ftp") || (KDUMP_SAVE_TARGET["target"]:nil == "cifs")) { - pos = find(parse_target, "@"); - if (pos != -1) { + pos = search(parse_target, "@"); + if (pos != nil) { string user_pas = substring(parse_target,0,pos); - pos1 = find(user_pas, ":"); - if (pos1 != -1) { - KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos1); - KDUMP_SAVE_TARGET["password"]=substring(parse_target,pos1+1,pos); + pos1 = search(user_pas, ":"); + if (pos1 != nil) { + KDUMP_SAVE_TARGET["user_name"]=substring(user_pas,0,pos1); + KDUMP_SAVE_TARGET["password"]=substring(user_pas,pos1+1,pos); } else { - KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); + KDUMP_SAVE_TARGET["user_name"]=substring(user_pas,0,pos); } parse_target = substring(parse_target,pos+1); } if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { - pos1 = find(parse_target, ":"); - pos = find(parse_target, "/"); - if (pos1 !=-1) { + pos1 = search(parse_target, ":"); + pos = search(parse_target, "/"); + if (pos1 != nil) { KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); } else { @@ -226,16 +226,19 @@ } KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); } else { - pos = find(parse_target, "/"); + pos = search(parse_target, "/"); KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); parse_target = substring(parse_target,pos+1); - pos = find(parse_target, "/"); + pos = search(parse_target, "/"); KDUMP_SAVE_TARGET["share"]=substring(parse_target,0,pos); KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); } } + y2milestone("--------------KDUMP_SAVE_TARGET---------------"); + y2milestone("%1",KDUMP_SAVE_TARGET); + y2milestone("--------------KDUMP_SAVE_TARGET---------------"); return true; } else { @@ -291,6 +294,11 @@ } //Popup::Message(result); + + y2milestone("-----------------KDUMP_SAVEDIR--------------------"); + y2milestone("%1",result); + y2milestone("-----------------KDUMP_SAVEDIR--------------------"); + return result; } @@ -412,7 +420,7 @@ } } else if (radiobutton == "select_dir") { - string dir = UI::AskForExistingDirectory("/", "Select directory for saving dump images"); + string dir = UI::AskForExistingDirectory("/", _("Select directory for saving dump images")); UI::ChangeWidget(`id ("dir"), `Value, dir); //KDUMP_SAVE_TARGET["dir"] = dir; @@ -444,7 +452,7 @@ if (radiobut == "local_filesystem") { value = tostring(UI::QueryWidget(`id ("dir"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Directory for Saving Dumps\""); + Popup::Error(_("You need specify \"Directory for Saving Dumps\"")); UI::SetFocus(`id("dir")); return false; } @@ -452,13 +460,13 @@ } else if (radiobut == "ftp") { value = tostring(UI::QueryWidget(`id ("server"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Server Name\""); + Popup::Error(_("You need specify \"Server Name\"")); UI::SetFocus(`id("server")); return false; } value = tostring(UI::QueryWidget(`id ("dir"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Directory on Server\""); + Popup::Error(_("You need specify \"Directory on Server\"")); UI::SetFocus(`id("dir")); return false; } @@ -466,7 +474,7 @@ if (!anon) { value = tostring(UI::QueryWidget(`id ("user_name"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"User Name\""); + Popup::Error(_("You need specify \"User Name\"")); UI::SetFocus(`id("user_name")); return false; } @@ -475,13 +483,13 @@ } else if ((radiobut == "ssh") || (radiobut == "nfs")) { value = tostring(UI::QueryWidget(`id ("server"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Server Name\""); + Popup::Error(_("You need specify \"Server Name\"")); UI::SetFocus(`id("server")); return false; } value = tostring(UI::QueryWidget(`id ("dir"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Directory on Server\""); + Popup::Error(_("You need specify \"Directory on Server\"")); UI::SetFocus(`id("dir")); return false; } @@ -489,19 +497,19 @@ } else if (radiobut == "cifs") { value = tostring(UI::QueryWidget(`id ("server"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Server Name\""); + Popup::Error(_("You need specify \"Server Name\"")); UI::SetFocus(`id("server")); return false; } value = tostring(UI::QueryWidget(`id ("dir"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Directory on Server\""); + Popup::Error(_("You need specify \"Directory on Server\"")); UI::SetFocus(`id("dir")); return false; } value = tostring(UI::QueryWidget(`id ("share"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"Exported Share\""); + Popup::Error(_("You need specify \"Exported Share\"")); UI::SetFocus(`id("share")); return false; } @@ -509,7 +517,7 @@ if (anon) { value = tostring(UI::QueryWidget(`id ("user_name"), `Value)); if ((value == nil) || (value == "")) { - Popup::Error("You need specify \"User Name\""); + Popup::Error(_("You need specify \"User Name\"")); UI::SetFocus(`id("user_name")); return false; } @@ -693,12 +701,12 @@ if (Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil != "") { UI::ChangeWidget(`id("raw_partitions"), `Items, Kdump::uknown_fs_partitions); string value = tostring(find(string key, Kdump::uknown_fs_partitions, - ``(find(key, Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil) != -1))); + ``(search(key, tostring(Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil)) != -1))); //Popup::Message(value); if ((value != nil) && (value != "")) UI::ChangeWidget(`id("raw_partitions"), `Value, value); else - Popup::Error("Partition doesn't exist on your disks!"); + Popup::Error(_("Partition doesn't exist on your disks")); } else if (size(Kdump::uknown_fs_partitions)>0) { UI::ChangeWidget(`id("raw_partitions"), `Items, Kdump::uknown_fs_partitions); //uknown_fs_partitions); //UI::ChangeWidget(`id("enable_raw_partitions"), `Value, false); @@ -719,8 +727,9 @@ boolean enabled = (boolean) UI::QueryWidget(`id("enable_raw_partitions"), `Value); if (enabled) { string value = tostring(UI::QueryWidget(`id("raw_partitions"), `Value)); - integer position = find(value," "); - Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"] = substring(value, 0, position); + integer position = search(value," "); + if (position != nil) + Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"] = substring(value, 0, position); //Popup::Message(Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"]:nil); } else { Kdump::KDUMP_SETTINGS["KDUMP_DUMPDEV"] = ""; @@ -1149,32 +1158,5 @@ } - - - - - - - - - - - - - - - - - - - - - - - - - - - - +/* EOF */ } \ No newline at end of file Modified: trunk/kdump/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/wizards.ycp?rev=40143&r1=40142&r2=40143&view=diff ============================================================================== --- trunk/kdump/src/wizards.ycp (original) +++ trunk/kdump/src/wizards.ycp Thu Aug 9 17:50:48 2007 @@ -96,27 +96,5 @@ return ret; } -/** - * Whole configuration of kdump but without reading and writing. - * For use with autoinstallation. - * @return sequence result - */ -any KdumpAutoSequence() { - - /* Initialization dialog caption */ - string caption = _("Kdump Configuration"); - /* Initialization dialog contents */ - term contents = `Label(_("Initializing...")); - - Wizard::CreateDialog(); - Wizard::SetContentsButtons(caption, contents, "", - Label::BackButton(), Label::NextButton()); - - any ret = MainSequence(); - - UI::CloseDialog(); - return ret; -} - /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org