Author: juhliarik Date: Fri Nov 7 11:38:19 2008 New Revision: 53044 URL: http://svn.opensuse.org/viewcvs/yast?rev=53044&view=rev Log: delete unsupported options from kdump Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/kdump.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=53044&r1=53043&r2=53044&view=diff ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Fri Nov 7 11:38:19 2008 @@ -218,11 +218,10 @@ "KDUMP_COMMANDLINE" : "", "KDUMP_COMMANDLINE_APPEND" : "", "KEXEC_OPTIONS" : "", - "KDUMP_RUNLEVEL" : "1", "KDUMP_IMMEDIATE_REBOOT" : "yes", "KDUMP_COPY_KERNEL" : "yes", "KDUMP_TRANSFER" : "", - "KDUMP_SAVEDIR" : "file:///var/log/dump", + "KDUMP_SAVEDIR" : "file:///var/crash", "KDUMP_KEEP_OLD_DUMPS" : "5", "KDUMP_FREE_DISK_SIZE" : "64", "KDUMP_VERBOSE" : "3", Modified: trunk/kdump/src/kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.ycp?rev=53044&r1=53043&r2=53044&view=diff ============================================================================== --- trunk/kdump/src/kdump.ycp (original) +++ trunk/kdump/src/kdump.ycp Fri Nov 7 11:38:19 2008 @@ -165,12 +165,6 @@ } //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(""); @@ -189,13 +183,7 @@ //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 @@ -488,31 +476,6 @@ } - -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 were used.")); - return false; - } - - -} - boolean cmdKdumpCustomKernel (map options) { if (options["kernel"]:nil!=nil) { @@ -591,28 +554,6 @@ } -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 were used.")); - return false; - } - -} - - boolean cmdKdumpKeepOldDumps (map options) { if (options["no"]:nil!=nil) { @@ -793,16 +734,7 @@ "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 @@ -850,15 +782,6 @@ ], ], - "runlevel" : $[ - "handler" : cmdKdumpRunLevel, - // TRANSLATORS: CommandLine help - "help" : _("The runlevel to boot the kdump kernel.(1,2,3,5,s)"), - "example" : [ - "runlevel level=1", - ], - ], - "keepolddumps" : $[ "handler" : cmdKdumpKeepOldDumps, // TRANSLATORS: CommandLine help -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org