Author: thardeck Date: Tue Aug 16 15:11:51 2011 New Revision: 65355 URL: http://svn.opensuse.org/viewcvs/yast?rev=65355&view=rev Log: - extended dump module to support dasd multi-volume dump devices (fate#304024) - added onpanic module - a fronted for dumpconf Added: trunk/s390/agents/cfg_dumpconf.scr trunk/s390/src/clients/onpanic.desktop trunk/s390/src/clients/onpanic.ycp trunk/s390/src/dump/ui.ycp trunk/s390/src/modules/OnPanic.ycp trunk/s390/src/onpanic/ trunk/s390/src/onpanic/Makefile.am trunk/s390/src/onpanic/Makefile.in trunk/s390/src/onpanic/ui.ycp Removed: trunk/s390/src/dump/dialogs.ycp trunk/s390/src/dump/helps.ycp trunk/s390/src/dump/wizards.ycp Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/Makefile.am trunk/s390/src/clients/Makefile.am trunk/s390/src/clients/dump.ycp trunk/s390/src/dump/Makefile.am trunk/s390/src/modules/Dump.ycp trunk/s390/src/modules/Makefile.am Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Tue Aug 16 15:11:51 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Added: trunk/s390/agents/cfg_dumpconf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/agents/cfg_dumpconf.scr?rev=65355&view=auto ============================================================================== --- trunk/s390/agents/cfg_dumpconf.scr (added) +++ trunk/s390/agents/cfg_dumpconf.scr Tue Aug 16 15:11:51 2011 @@ -0,0 +1,17 @@ +/** + * File: + * cfg_dumpconf.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/dumpconf + * using the sysconfig-agent + * + * $Id: cfg_dumpconf.scr 18211 2011-08-04 12:59:57Z thardeck $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/dumpconf</tt> + * in an easy manner. + */ +.sysconfig.dumpconf + +`ag_ini( + `SysConfigFile("/etc/sysconfig/dumpconf") +) Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Tue Aug 16 15:11:51 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 9 14:06:43 UTC 2011 - thardeck@novell.com + +- extended dump module to support dasd multi-volume dump devices (fate#304024) +- added onpanic module - a fronted for dumpconf + +------------------------------------------------------------------- Fri Aug 5 12:34:53 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/s390/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/Makefile.am?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/Makefile.am (original) +++ trunk/s390/src/Makefile.am Tue Aug 16 15:11:51 2011 @@ -1 +1 @@ -SUBDIRS = zfcp dasd xpram dump modules clients config +SUBDIRS = zfcp dasd xpram dump onpanic modules clients config Modified: trunk/s390/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/Makefile.am?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/clients/Makefile.am (original) +++ trunk/s390/src/clients/Makefile.am Tue Aug 16 15:11:51 2011 @@ -10,6 +10,7 @@ s390-disk-controller.ycp\ xpram.ycp \ dump.ycp \ + onpanic.ycp \ inst_dasd.ycp \ inst_zfcp.ycp \ dasd_proposal.ycp \ @@ -19,7 +20,8 @@ zfcp.desktop \ dasd.desktop \ xpram.desktop \ - dump.desktop + dump.desktop \ + onpanic.desktop EXTRA_DIST = $(client_DATA) $(desktop_DATA) Modified: trunk/s390/src/clients/dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dump.ycp?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/clients/dump.ycp (original) +++ trunk/s390/src/clients/dump.ycp Tue Aug 16 15:11:51 2011 @@ -1,18 +1,16 @@ /** - * File: clients/controller.ycp - * Package: Configuration of controller + * File: clients/dump.ycp + * Package: Creation of s390 dump devices * Summary: Main file - * Authors: Jiri Srain + * Authors: Tim Hardeck * - * $Id$ - * - * Main file for controller configuration. Uses all other files. + * Main file for s390 dump devices creation. Uses all other files. */ { /*** - * <h3>Configuration of controller</h3> + * <h3>Creation of s390 dump devices</h3> */ textdomain "s390"; @@ -21,36 +19,29 @@ y2milestone ("----------------------------------------"); y2milestone ("Dump module started"); -import "Progress"; -import "Report"; -import "Summary"; - import "CommandLine"; -include "s390/dump/wizards.ycp"; +include "s390/dump/ui.ycp"; map cmdline_description = $[ - "id" : "controller", - // Command line help text for the Xcontroller module - "help" : _("Configuration of controller"), - "guihandler" : DumpSequence, - "initialize" : Dump::Read, - "finish" : Dump::Write, - "actions" : $[ + "id" : "dumpdevices", + // Command line help text for the Xcontroller module + "help" : _("Creation of s390 dump devices"), + "guihandler" : DumpSequence, + "actions" : $[ // FIXME TODO: fill the functionality description here - ], - "options" : $[ + ], + "options" : $[ // FIXME TODO: fill the option descriptions here - ], - "mapping" : $[ + ], + "mapping" : $[ // FIXME TODO: fill the mappings of actions and options here - ] + ] ]; /* main ui function */ -any ret = nil; +any ret = CommandLine::Run(cmdline_description); -ret = CommandLine::Run(cmdline_description); //ret = DumpSequence (); y2debug("ret=%1", ret); Added: trunk/s390/src/clients/onpanic.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/onpanic.desktop?rev=65355&view=auto ============================================================================== --- trunk/s390/src/clients/onpanic.desktop (added) +++ trunk/s390/src/clients/onpanic.desktop Tue Aug 16 15:11:51 2011 @@ -0,0 +1,24 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=onpanic + +X-SuSE-YaST-Group=Hardware +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource= + +Icon=yast-onpanic +Exec=/sbin/yast2 onpanic + +Name=On Panic +GenericName=Configures the actions which should be performed after a kernel panic +StartupNotify=true Added: trunk/s390/src/clients/onpanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/onpanic.ycp?rev=65355&view=auto ============================================================================== --- trunk/s390/src/clients/onpanic.ycp (added) +++ trunk/s390/src/clients/onpanic.ycp Tue Aug 16 15:11:51 2011 @@ -0,0 +1,58 @@ +/** + * File: clients/onpanic.ycp + * Package: Configuration of onpanic + * Summary: Main file + * Authors: Tim Hardeck + * + * $Id: irda.ycp 22889 2005-04-01 09:12:51Z jsuchome $ + * + * Main file for onpanic configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of onpanic</h3> + */ + +textdomain "s390"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("OnPanic module started"); + +import "CommandLine"; +import "OnPanic"; + +include "s390/onpanic/ui.ycp"; + +map cmdline_description = $[ + "id" : "onpanic", + /* Command line help text for the Xirda module */ + "help" : _("Configuration of OnPanic"), + "guihandler" : OnPanicSequence, + "initialize" : OnPanic::Read, + "finish" : OnPanic::Write, + "actions" : $[ + // FIXME TODO: fill the functionality description here + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], +]; + + +/* main ui function */ +any ret = CommandLine::Run (cmdline_description); + +//ret = OnPanicSequence (); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("OnPanic module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Modified: trunk/s390/src/dump/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dump/Makefile.am?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/dump/Makefile.am (original) +++ trunk/s390/src/dump/Makefile.am Tue Aug 16 15:11:51 2011 @@ -3,9 +3,7 @@ yncludedir = @yncludedir@/s390/dump ynclude_DATA = \ - helps.ycp \ - wizards.ycp \ - dialogs.ycp + ui.ycp EXTRA_DIST = $(ynclude_DATA) Added: trunk/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dump/ui.ycp?rev=65355&view=auto ============================================================================== --- trunk/s390/src/dump/ui.ycp (added) +++ trunk/s390/src/dump/ui.ycp Tue Aug 16 15:11:51 2011 @@ -0,0 +1,172 @@ +/** + * File: include/s390/dump/ui.ycp + * Package: Creation of s390 dump devices + * Summary: Dialogs definitions + * Authors: Tim Hardeck + * + */ + +{ + +textdomain "s390"; + +import "Dump"; +import "Label"; +import "Popup"; +import "Wizard"; + +/** + * Run the dialog for Dump + * @param what symbol a + * @return symbol EditDumpDialog that was edited + */ +symbol DumpDialog () { + string caption = _("Create Dump Device"); + string help = _(" +<p><b>Prepare one or more volumes for use as S/390 dump device.</b></p> +<p>Supported devices are ECKD DASD and ZFCP disks, while multi-volumes are limited to DASD.<br> +Only whole disks can be used, no partitions! If the device is incompatible formatted/partioned, activate the checkbox +<b>Force overwrite of disk</b></p> +<p>Devices which are in use or have mounted partitions will not be shown.<br> +The mentioning of <b>dumpdevice</b> after a disk indicates that it is an already usable dump device. Additionally multi-volume dump devices are indicated by the list of including DASD ids. </p> +<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br> +DASD columns: Device, Size, ID, Dump</p>"); + + list<string> dasd_disks = Dump::dasd_disks; + list<string> zfcp_disks = Dump::zfcp_disks; + + // define default active selection (`dasd, `zfcp) + symbol type = `zfcp; + + + /* Dialog content */ + term content = `HBox( `VBox( + `RadioButtonGroup(`id(`disk), + `VBox( + `Frame("", `VBox( + `Left(`RadioButton(`id(`zfcp), `opt(`notify), _("&ZFCP"), type == `zfcp)), + `ComboBox (`id(`zfcp_disks), `opt (`hstretch), "", + zfcp_disks + ))), + `VSpacing (0.3), + `Frame("", `VBox( + `Left(`RadioButton(`id(`dasd), `opt(`notify), _("&DASD"), type == `dasd)), + `MultiSelectionBox( `id( `dasd_disks ), "", + dasd_disks + ))) + ) + ), + `VSpacing (0.3), + `Left (`CheckBox (`id (`force), `opt(`notify), _("&Force overwrite of disk"))) + )); + + /* Apply the settings */ + Wizard::SetContentsButtons (caption, content, help, Label::BackButton (), Label::CreateButton()); + Wizard::HideBackButton(); + Wizard::SetAbortButton(`cancel, Label::CancelButton()); + + UI::ChangeWidget(`id(`dasd_disks), `Enabled, type == `dasd); + UI::ChangeWidget(`id(`zfcp_disks), `Enabled, type == `zfcp); + + boolean force = false; + symbol ret = nil; + + do + { + ret = (symbol) UI::UserInput(); + + if (ret == `force) + { + force = (boolean)UI::QueryWidget (`id (`force), `Value); + } + + // disable inactive area + if (ret == `dasd || ret == `zfcp) + { + UI::ChangeWidget(`id(`dasd_disks), `Enabled, ret == `dasd); + UI::ChangeWidget(`id(`zfcp_disks), `Enabled, ret == `zfcp); + } + + if (contains ([`create, `ok, `next, `finish], ret)) + { + string device = ""; + type = (symbol) UI::QueryWidget(`id(`disk), `CurrentButton); + + // gather selected device[s] + list<string> entries = [ ]; + if (type == `zfcp) { //zfcp + string dev_line = (string)UI::QueryWidget (`id (`zfcp_disks), `Value); + entries = splitstring (dev_line, "\t"); + device = entries[0]:""; + } + else // dasd + { + list<string> selected_items = (list<string>)UI::QueryWidget( `id(`dasd_disks), `SelectedItems ); + foreach (string dev_line, selected_items, + { + entries = splitstring (dev_line, "\t"); + // prevent leading space + if (device != "") + { + device = device + " " + entries[0]:""; + } + else + { + device = entries[0]:""; + } + }); + } + + if (size(device) == 0) + { + Popup::Notify (_("You haven't selected any device.")); + } + else + { + // warn only in case of force + if (!force || Popup::YesNo (sformat (_("The disk[s] %1 will be formatted as a dump device. All data on this device[s] will be lost! Continue?"), device))) + { + boolean success = Dump::FormatDisk (device, force); + // don't quit in case of failures, error messages are reported by FormatDisk() + if (success && !Popup::YesNo (_("Operation successful. Initialize another dump device?"))) + { + ret = `cancel; + } + else + { + // reinitialize devices + ret = `again; + } + } + } + } + } while (!contains ([`abort, `cancel, `again], ret)); + return (symbol) ret; +} + + +/** + * The whole squence + * @return sequence result + */ +symbol DumpSequence() { + symbol ret = nil; + // reset dialog if required + do + { + // recreate dialog everytime to show the read progress bar after the creation progress bar + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("dump"); + Dump::Read (); + + ret = DumpDialog (); + UI::CloseDialog(); + } while (ret == `again); + + return ret; +} + +/* EOF */ +} + + Modified: trunk/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Dump.ycp?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/modules/Dump.ycp (original) +++ trunk/s390/src/modules/Dump.ycp Tue Aug 16 15:11:51 2011 @@ -1,10 +1,8 @@ /** * File: modules/Dump.ycp - * Package: Configuration of S/390 specific stuff + * Package: Creation of s390 dump devices * Summary: Creating dump devices for S/390 - * Authors: Jiri Srain - * - * $Id$ + * Authors: Tim Hardeck * */ @@ -13,92 +11,66 @@ module "Dump"; textdomain "s390"; -import "Mode"; -import "Progress"; import "Report"; -import "Stage"; -import "Summary"; -import "Arch"; -//import "Bootloader"; - - -global map > devices = $[]; - -global map current_device = $[]; - -/** - * Prototypes - */ -global boolean Modified(); - -/** - * Data was modified? - */ -global boolean modified = false; +import "String"; +import "Progress"; /** - */ -global boolean proposal_valid = false; - + * DASD devices list of mkdump + */ +global define list<string> dasd_disks = [ ]; /** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -global boolean write_only = false; + * ZFCP devices list of mkdump + */ +global define list<string> zfcp_disks = [ ]; /** - * Abort function - * return boolean return true if abort + * Get a List of available Disks of type + * @return list<string> of disks */ -global boolean() AbortFunction = Modified; +define list<string> GetAvailableDisks (string type) { + list<string> device_list = nil; + if (type == "dasd" || type == "zfcp") + { + string cmd = "mkdump --list-" + type; + y2milestone ("Running command %1", cmd); + map output = (map) SCR::Execute(.target.bash_output, cmd); + y2milestone ("Command return code: %1", (integer)output["exit"]:0); + y2milestone ("Command output:\n%1\n%2", output["stdout"]:"", output["stderr"]:""); + device_list = String::NewlineItems (output["stdout"]:""); + } + return device_list; -/** - * Abort function - * @return blah blah lahjk - */ -global define boolean Abort() ``{ - if(AbortFunction != nil) - return AbortFunction (); - return false; } -/** - * Data was modified? - * @return true if modified - */ -global boolean Modified() { - y2debug("modified=%1",modified); - return modified; -} +global define boolean Read () { + string caption = _("Checking Disks"); + integer steps = 2; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Checking DASD disks"), + /* Progress stage 2/2 */ + _("Checking ZFCP disks") + ], [ + /* Progress step 1/2 */ + _("Checking DASD disks..."), + /* Progress step 2/2 */ + _("Checking ZFCP disks..."), + /* Progress finished */ + _("Finished") + ], + "" + ); -/** - * Is this kind of disk controller available? - * @return boolean true if it is - */ -global boolean Available () { - return true; -} + Progress::NextStage(); + dasd_disks = Dump::GetAvailableDisks ("dasd"); -/** - * Read all controller settings - * @return true on success - */ -global boolean Read() { - list > sections = [];//Bootloader::GetSections (); - foreach (map s, sections, { - if (s["type"]:"" == "dump") - { - string name = s["name"]:""; - string device = s["dump_device"]:""; - devices[device] = $[ - "boot_section" : name, - "boot_section_orig" : s["original_name"]:"", - "format" : false, - ]; - } - }); - return true; + Progress::NextStage(); + zfcp_disks = Dump::GetAvailableDisks ("zfcp"); + Progress::NextStage(); + return (dasd_disks != nil && zfcp_disks != nil); } /** @@ -107,174 +79,73 @@ * @param force boolean true to append the -f parameter * @return boolean true on success */ -global boolean FormatDisk (string dev, boolean force) { - string cmd = force - ? "/sbin/mkdump -f" +global define boolean FormatDisk (string dev, boolean force) { + string caption = _("Creating Dump Device[s]"); + integer steps = 1; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/1 */ + _("Creating dump device[s]") + ], [ + /* Progress step 1/1 */ + _("Creating dump device[s]. This process might take some minutes."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + Progress::NextStage(); + string cmd = force + ? "/sbin/mkdump --force" : "/sbin/mkdump"; - cmd = cmd + " " + dev; - y2milestone ("Running command %1", cmd); - integer ret = (integer)SCR::Execute (.target.bash, cmd); - y2milestone ("Return value: %1", ret); - if (ret != 0) - { - string err = ""; - if (ret == 1) - // error description - err = _("Disk unusable."); - else if (ret == 2) - // error description - err = _("Support program not installed."); - else if (ret == 11) - // error description - err = _("Invalid or unusable disk (fatal)."); - else if (ret == 12) - // error description - err = _("Minor error, can be corrected with -f."); - else if (ret == 13) - // error description - err = _("Missing support programs."); - else - // error description, %1 is error code (integer) - err = sformat (_("Error code from support program: %1."), ret); - // error report, %1 is device name, %2 error description - Report::Error (sformat (_("Cannot create dump device %1:\n%2"), - dev, err)); - return false; - } - return true; -} + cmd = cmd + " " + dev; -/** - * Write all controller settings - * @return true on success - */ -global boolean Write() { - map > backup_devices = devices; - foreach (string dev, map info, devices, { - if (info["format"]:false) + y2milestone ("Running command %1", cmd); + map output = (map) SCR::Execute (.target.bash_output, cmd); + integer ret = output["exit"]:0; + string message = output["stdout"]:""; + string err_message = output["stderr"]:""; + + y2milestone ("mkdump return value: %1", ret); + if (message != "") { - string cmd = info["force"]:false - ? "/sbin/mkdump -f" - : "/sbin/mkdump"; - cmd = cmd + " " + dev; - y2milestone ("Running command %1", cmd); - integer ret = (integer)SCR::Execute (.target.bash, cmd); - y2milestone ("Return value: %1", ret); - if (ret != 0) - { - string err = ""; - if (ret == 1) - // error description - err = _("Disk unusable."); - else if (ret == 2) - // error description - err = _("Support program not installed."); - else - // error description - err = _("Error code from support program."); - // error report, %1 is device name, %2 error description - Report::Error (sformat (_("Cannot create dump device %1:\n%2"), - dev, err)); - } + y2milestone ("mkdump message: %1", message); } - }); - boolean bl_needs_update = false; - list > sections = [];//Bootloader::GetSections (); - sections = filter (map s, sections, { - string device = s["dump_device"]:""; - if (s["type"]:"" == "dump") + if (err_message != "") { - if (haskey (devices, device)) - { - devices = remove (devices, device); - return true; - } - else - { - bl_needs_update = true; - return false; - } + y2milestone ("mkdump error message: %1", err_message); } - else - { - return true; - } - }); - if (size (devices) > 0) // new device added - { - bl_needs_update = true; - foreach (string dev, map info, devices, { - sections = add (sections, $[ - "name" : info["boot_section"]:dev, - "type" : "dump", - "original_name" : - info["boot_section_orig"]:info["boot_section"]:dev, - "dump_device" : dev, - ]); - }); - } - if (bl_needs_update) - { - //Bootloader::SetSections (sections); -// Bootloader::Write (); - } - devices = backup_devices; - return true; -} + Progress::NextStage(); -/** - * Get all controller 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) { - return true; // FIXME -} - -/** - * Dump the controller settings to a single map - * (For use by autoinstallation.) - * @return map Dumped settings (later acceptable by Import ()) - */ -global map Export () { - return $[]; -} - -/** - * Create a textual summary and a list of unconfigured cards - * @return summary of the current configuration - */ -global list Summary() { - 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() { - return $[ "install":[], "remove":[] ]; -} - -/** - * Create a List of available Disks - * @return list<string> of disks - */ -global list<string> AvailableDisks () { - list<map> disks = (list<map>)SCR::Read (.probe.disk); - list<string> dev_names = maplist (map d, disks, { - return d["dev_name"]:""; - }); - dev_names = filter (string d, dev_names, { - return d != "" && ! haskey (devices, d); - }); - return dev_names; + if (ret != 0) + { + string err = ""; + if (ret == 11) + // error description + err = _("Invalid or unusable disk (fatal)."); + else if (ret == 12) + // error description + err = _("Incompatible formatting/partitioning, can be corrected with Force."); + else if (ret == 13) + // error description + err = _("Missing support programs."); + else if (ret == 14) + // error description + err = _("Missing or wrong parameters."); + else if (ret == 15) + // error description + err = _("Access problem."); + else + // error description, %1 is error code (integer) + err = sformat (_("Error code from support program: %1."), ret); + // error report, %1 is device name, %2 error description + Report::Error (sformat (_("Cannot create dump device %1:\n%2"), dev, err)); + return false; + } + return true; } - /* EOF */ } Modified: trunk/s390/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Makefile.am?rev=65355&r1=65354&r2=65355&view=diff ============================================================================== --- trunk/s390/src/modules/Makefile.am (original) +++ trunk/s390/src/modules/Makefile.am Tue Aug 16 15:11:51 2011 @@ -4,7 +4,8 @@ DASDController.ycp \ ZFCPController.ycp \ Xpram.ycp \ - Dump.ycp + Dump.ycp \ + OnPanic.ycp EXTRA_DIST = $(module_DATA) Added: trunk/s390/src/modules/OnPanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/OnPanic.ycp?rev=65355&view=auto ============================================================================== --- trunk/s390/src/modules/OnPanic.ycp (added) +++ trunk/s390/src/modules/OnPanic.ycp Tue Aug 16 15:11:51 2011 @@ -0,0 +1,294 @@ +/** + * File: modules/OnPanic.ycp + * Package: Configuration of OnPanic + * Summary: Configuration of kernel panic reaction + * Authors: Tim Hardeck + * + * Representation of the dumpconf configuration. + * Input and output routines. + */ + +{ + +module "OnPanic"; +textdomain "s390"; + +import "FileUtils"; +import "Progress"; +import "Service"; +import "String"; +import "Integer"; + +/** + * Maximal allowed characters for VMCMD? + */ +global const integer VMCMD_MAX_CHARS = 400; + +/** + * Data was modified? + */ +global boolean modified = false; + +/** + * Should dumpconf be started? + */ +global boolean start = false; + +/** + * Panic reaction + */ +global string on_panic = ""; + +/** + * Delay minutes + */ +global integer delay_min = 5; + +/** + * VMCMD commands + */ +global string vmcmds = ""; + +/** + * Dump Device mkdump line + */ +global string dump_line = ""; + +/** + * Dump Devices list of mkdump (no need to run mkdump more than once) + */ +global list<string> dump_devices = nil; + + +/**Get a List of available Dump Devices + * @return list<string> of disks + */ +define list<string> AvailableDumpDevices () { + string cmd = "mkdump --list-dump"; + y2milestone ("Running command %1", cmd); + map output = (map) SCR::Execute(.target.bash_output, cmd); + y2milestone ("Command return code: %1", (integer)output["exit"]:0); + y2milestone ("Command output:\n%1\n%2", output["stdout"]:"", output["stderr"]:""); + list<string> dev_names = String::NewlineItems (output["stdout"]:""); + return dev_names; +} + +/**Converts a MKDump entry to a device parameters map for dumpconf + * @param mkdump device line + * @return map of device parameters + */ +define map ConvertMkdumpToConf (string dev_line) { + map dev = $[ ]; + + list<string> entry = splitstring(dev_line, "\t"); + boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[a-z]+$"); + boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[a-z]+$"); + + if (is_dasd) + { + dev = add(dev, "DUMP_TYPE", "ccw"); + dev = add(dev, "DEVICE", entry[2]:nil); + } + if (is_zfcp) + { + dev = add(dev, "DUMP_TYPE", "fcp"); + dev = add(dev, "DEVICE", entry[2]:nil); + dev = add(dev, "WWPN", entry[3]:nil); + dev = add(dev, "LUN", entry[4]:nil); + dev = add(dev, "BOOTPROG", "0"); + dev = add(dev, "BR_LBA", "0"); + } + + if (!is_dasd && !is_zfcp ) + { + y2milestone ("Incompatible mkdump line in ConvertMkdumpToConf(): \"%1\"", dev_line); + } + + return dev; +} + +/**Converts device parameters of dumpconf to an mkdump entry + * @param dumpconf device map + * @return string of a mkdump entry + */ +define string ConvertConfToMkdump (map dev) { + string mkdump = ""; + + string type = (string) dev["DUMP_TYPE"]:nil; + foreach (string entry, dump_devices,{ + list<string> line = splitstring(entry, "\t"); + if ( // check for fitting dasd + (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[a-z]+") + && line[2]:nil == dev["DEVICE"]:nil) + || // check for fitting zfcp + (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[a-z]+") + && line[2]:nil == dev["DEVICE"]:nil + && line[3]:nil == dev["WWPN"]:nil + && line[4]:nil == dev["LUN"]:nil) + ) + { + mkdump = entry; + y2milestone ("In /etc/sysconfig/dumpconf configured dump device found: %1", mkdump); + break; + } + }); + + if (mkdump == "") + { + y2milestone ("Couldn't find the configured dump device."); + } + + return mkdump; +} + + +/** + * Read OnPanic settings from /etc/sysconfig/dumpconf + * @return true when file exists + */ +global define boolean ReadSysconfig () { + y2milestone ("Reading Sysconfig entries"); + if (FileUtils::Exists ("/etc/sysconfig/dumpconf")) + { + on_panic = (string) SCR::Read (.sysconfig.dumpconf.ON_PANIC); + + delay_min = tointeger ((string) SCR::Read (.sysconfig.dumpconf.DELAY_MINUTES)); + if (delay_min < 0) + delay_min = 5; + + map dump_device = $[ ]; + foreach (string type, ["DUMP_TYPE", "DEVICE", "WWPN", "LUN", "BOOTPROG", "BR_LBA"],{ + string value = (string) SCR::Read (.sysconfig.dumpconf + type); + if (value != "") + { + dump_device = add(dump_device, type, value); + } + }); + dump_line = ConvertConfToMkdump(dump_device); + + string config_entry = ""; + foreach(integer i, Integer::RangeFrom(1, 6), { + config_entry = (string) SCR::Read (.sysconfig.dumpconf + ("VMCMD_" + tostring(i))); + if (config_entry != "") + { + // prevent leading newline + if (vmcmds == "") + { + vmcmds = config_entry; + } + else + { + vmcmds = mergestring([vmcmds, config_entry], "\n"); + } + } + }); + + return true; + } + return false; +} + +/** + * Read all OnPanic settings + * @return true on success + */ +global define boolean Read () { + /* Dumpconf read dialog caption */ + string caption = _("Reading Dumpconf Configuration"); + integer steps = 2; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Checking dump devices"), + /* Progress stage 2/2 */ + _("Reading settings") + ], [ + /* Progress step 1/2 */ + _("Checking dump devices..."), + /* Progress step 2/2 */ + _("Reading the settings..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + Progress::NextStage(); + dump_devices = AvailableDumpDevices(); + + Progress::NextStage(); + ReadSysconfig (); + start = Service::Enabled ("dumpconf"); + + Progress::NextStage(); + + return true; +} + +/** + * Write all OnPanic settings + * @return true on success + */ +global define boolean Write () { + if (!modified) + { + return true; + } + + /* Dumpconf write dialog caption */ + string caption = _("Saving Dumpconf Configuration"); + integer steps = 2; + + Progress::New (caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Restart the service") + ], [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Restarting service..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + Progress::NextStage(); + y2milestone ("Writing Sysconfig entries"); + SCR::Write (.sysconfig.dumpconf.ON_PANIC, on_panic); + + SCR::Write (.sysconfig.dumpconf.DELAY_MINUTES, delay_min); + + map dump_device = ConvertMkdumpToConf(dump_line); + foreach (string type, ["DUMP_TYPE", "DEVICE", "WWPN", "LUN", "BOOTPROG", "BR_LBA"],{ + SCR::Write (.sysconfig.dumpconf + type, dump_device[type]:""); + }); + + list<string> vmcmd_list = splitstring(vmcmds, "\n"); + foreach(integer i, Integer::RangeFrom(1, 6), { + SCR::Write (.sysconfig.dumpconf + ("VMCMD_" + tostring(i)), vmcmd_list[i-1]:""); + }); + + SCR::Write (.sysconfig.dumpconf, nil); + + Progress::NextStage (); + // stopping since dumpconf restart doesn't work correctly + Service::Stop ("dumpconf"); + if (start) + { + Service::Enable ("dumpconf"); + Service::Start ("dumpconf"); + } + else + { + Service::Disable ("dumpconf"); + } + + Progress::NextStage(); + return true; +} + +/* EOF */ +} Added: trunk/s390/src/onpanic/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/Makefile.am?rev=65355&view=auto ============================================================================== --- trunk/s390/src/onpanic/Makefile.am (added) +++ trunk/s390/src/onpanic/Makefile.am Tue Aug 16 15:11:51 2011 @@ -0,0 +1,10 @@ +# Makefile.am for dasd/src + +yncludedir = @yncludedir@/s390/onpanic + +ynclude_DATA = \ + ui.ycp + +EXTRA_DIST = $(ynclude_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/s390/src/onpanic/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/Makefile.in?rev=65355&view=auto ============================================================================== --- trunk/s390/src/onpanic/Makefile.in (added) +++ trunk/s390/src/onpanic/Makefile.in Tue Aug 16 15:11:51 2011 @@ -0,0 +1,431 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Makefile.am for dasd/src + +# Makefile.am.common -*- Makefile -*- +# Generated file, do not edit! + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.am.common +subdir = src/onpanic +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(modulebindir)" \ + "$(DESTDIR)$(yncludedir)" +modulebinDATA_INSTALL = $(INSTALL_DATA) +yncludeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(modulebin_DATA) $(ynclude_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@/s390/onpanic +ystartupdir = @ystartupdir@ +ynclude_DATA = \ + ui.ycp + +EXTRA_DIST = $(ynclude_DATA) +modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) +modulebindir = $(moduledir) +ybcfiles = $(filter %.ybc,$(modulebin_DATA)) + +# files to clean +CLEANFILES = ${ybcfiles} +DISTCLEANFILES = .dep + +# Needs to be outside "." because of cases +# where ycpchook contains a symlink to "." +# Otherwise "." keeps being newer than .dep and we loop. +NEWDEP = ${top_builddir}/.dep.new +CHECK_SYNTAX = true +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/onpanic/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/onpanic/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-modulebinDATA: $(modulebin_DATA) + @$(NORMAL_INSTALL) + test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)" + @list='$(modulebin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(modulebinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(modulebindir)/$$f'"; \ + $(modulebinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(modulebindir)/$$f"; \ + done + +uninstall-modulebinDATA: + @$(NORMAL_UNINSTALL) + @list='$(modulebin_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \ + rm -f "$(DESTDIR)$(modulebindir)/$$f"; \ + done +install-yncludeDATA: $(ynclude_DATA) + @$(NORMAL_INSTALL) + test -z "$(yncludedir)" || $(MKDIR_P) "$(DESTDIR)$(yncludedir)" + @list='$(ynclude_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(yncludeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(yncludedir)/$$f'"; \ + $(yncludeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(yncludedir)/$$f"; \ + done + +uninstall-yncludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(ynclude_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(yncludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(yncludedir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-modulebinDATA install-yncludeDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-modulebinDATA uninstall-yncludeDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic dist-hook \ + distclean distclean-generic distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-modulebinDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-yncludeDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-modulebinDATA \ + uninstall-yncludeDATA + + +# suffix mapping: info '(make)Static Usage' +# apply only to our modules, not external ones +${ybcfiles}: %.ybc: %.ycp $(ycpchook) + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< +# generate dependencies +# two steps not to lose the file if the command fails +# hook: create the links before we look for files +.dep: $(wildcard *.ycp) ${ycpchook} + ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} + cat ${NEWDEP} > .dep + rm ${NEWDEP} + +dist-hook: check-syntax +check-syntax: $(client_DATA) $(ycpchook) + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi + +-include .dep +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/ui.ycp?rev=65355&view=auto ============================================================================== --- trunk/s390/src/onpanic/ui.ycp (added) +++ trunk/s390/src/onpanic/ui.ycp Tue Aug 16 15:11:51 2011 @@ -0,0 +1,228 @@ +/** + * File: include/s390/onpanic/ui.ycp + * Package: Configuration of OnPanic + * Summary: Dialogs definitions + * Authors: Tim Hardeck + * + */ + +{ + +textdomain "s390"; + +import "OnPanic"; +import "Label"; +import "Message"; +import "Package"; +import "Popup"; +import "Wizard"; + + +/** + * Should dumpconf be started? + */ +define boolean start = false; + +/**Update the screen according to user input + * @param return symbol + * @return void + */ +define void UpdateScreen (symbol ret) { + if (ret == `yes || ret == `no) + { + start = (ret == `yes); + } + + if (ret == `vmcmd) + { + string vmcmds = (string) UI::QueryWidget (`id (`vmcmd), `Value); + list<string> vmcmd_list = splitstring (vmcmds, "\n"); + // only five lines are allowed, remove every additional line + if (size(vmcmd_list) > 5) + { + vmcmd_list = sublist(vmcmd_list, 0, 5); + vmcmds = mergestring(vmcmd_list, "\n"); + UI::ChangeWidget (`id(`vmcmd), `Value, vmcmds); + Popup::Notify (_("Only five lines are allowed for VMCMD!")); + } + } + + if (start) + { + UI::ChangeWidget (`id (`rd), `CurrentButton, `yes); + UI::ChangeWidget (`id (`onpanic), `Enabled, true); + UI::ChangeWidget (`id (`delayminutes), `Enabled, true); + + // dis/enable widgets according to `onpanic selection + string on_panic = (string) UI::QueryWidget (`id (`onpanic), `Value); + UI::ChangeWidget (`id (`dumpdevice), `Enabled, + (on_panic == "dump" || on_panic == "dump_reipl") + ); + UI::ChangeWidget (`id (`vmcmd), `Enabled, + (on_panic == "vmcmd") + ); + } + else + { + // disable all widgets except of "enable dumpconf" + UI::ChangeWidget (`id(`rd), `CurrentButton, `no); + foreach (symbol widget, [`onpanic, `dumpdevice, `vmcmd, `delayminutes],{ + UI::ChangeWidget (`id (widget), `Enabled, false); + }); + } +} + +/** + * Dialog for seting up OnPanic + */ +define symbol OnPanicDialog () { + // On Panic Actions + list<string> actions = [ "stop", "dump", "reipl", "dump_reipl", "vmcmd" ]; + // Mkdump list of dump devices + list<string> dump_devices = OnPanic::dump_devices; + + // For translators: Caption of the dialog + string caption = _("On Panic Configuration"); + string help = _(" +<p><b>Configure the action[s] to be taken if a kernel panic occurs</b></p> +<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior during kernel panics.</p> + +<p>The following <b>Panic Actions</b> are possible:<br> +<b>stop</b> Stop Linux (default).<br> +<b>dump</b> Dump Linux and stop system.<br> +<b>reipl</b> Reboot Linux.<br> +<b>dump_reipl</b> Dump Linux and reboot system. It is only available on LPAR with z9® machines and later, and on z/VMversion 5.3 and later.<br> +<b>vmcmd</b> Execute specified CP commands and stop system.</p> + +<p>The time defined in <b>Delay Minutes</b> defers activating the specified panic action for a newly started system to prevent loops. If the system crashes before the time has elapsed the default action (stop) is performed.<br> +Every time an option is changed in this dialog the delay is triggered too.<br> +<u>So every panic action besides stop isn't available until Delay Minutes have passed</u>.</p> + +<p>The device for dumping the memory can be set with <b>Dump Device</b>. If no device is shown you have to create one with the <b>YaST Dump Devices</b> dialog.</p> + +<p>With <b>VMCMD</b> CP commands can be specified which are executed before the system is stopped. Only five lines are allowed.</p> +"); + + term content = `HBox (`HSpacing (3), `VBox ( + `VSpacing (2), + `VSquash(`HBox( + `RadioButtonGroup(`id(`rd), + `HSquash(`VBox( + `Left (`RadioButton(`id(`no), `opt (`notify), + // radio button label + _("Do No&t Start Dumpconf"), !start)), + `Left(`RadioButton(`id(`yes), `opt (`notify), + // radio button label + _("&Start Dumpconf"), start))))), + `HSpacing (5), + `VCenter(`HBox( + `ComboBox (`id(`onpanic), `opt(`notify, `hstretch), + // combobox label + _("&Panic Action"), actions), + `IntField(`id(`delayminutes), _("Delay &Minutes"), 0, 300, 5 ) + )))), + `VSpacing (), + `ComboBox (`id(`dumpdevice), `opt(`hstretch), + // combobox label + _("&Dump Device"), dump_devices), + `VSpacing (), + `MultiLineEdit( `id( `vmcmd ), `opt(`notify), _("&VMCMD"), "" ), + `VStretch () + ), `HSpacing(3)); + + + Wizard::SetContentsButtons (caption, content, help, Label::BackButton (), Label::OKButton()); + Wizard::HideBackButton(); + Wizard::SetAbortButton(`cancel, Label::CancelButton()); + + // set configuration settings if available + start = OnPanic::start; + // initialize fields + UI::ChangeWidget (`id(`onpanic), `Value, OnPanic::on_panic); + UI::ChangeWidget (`id(`delayminutes), `Value, OnPanic::delay_min); + UI::ChangeWidget (`id(`vmcmd), `Value, OnPanic::vmcmds); + UI::ChangeWidget (`id(`dumpdevice), `Value, OnPanic::dump_line); + // limit VMCMD length (plus 4 additional newline chars) + UI::ChangeWidget( `vmcmd, `InputMaxLength, OnPanic::VMCMD_MAX_CHARS + 4); + + symbol ret = nil; + UpdateScreen(ret); + + do + { + ret = (symbol) UI::UserInput (); + UpdateScreen(ret); + + // check for changes on final user actions + if (contains ([`back, `abort, `cancel, `next, `ok, `finish], ret)) + { + OnPanic::modified = (OnPanic::start != start + || OnPanic::on_panic != (string) UI::QueryWidget (`id (`onpanic), `Value) + || OnPanic::delay_min != (integer) UI::QueryWidget (`id (`delayminutes), `Value) + || OnPanic::vmcmds != (string) UI::QueryWidget (`id (`vmcmd), `Value) + || OnPanic::dump_line != (string) UI::QueryWidget (`id (`dumpdevice), `Value)); + + // if settings were changed don't exit without asking + if (contains ([`back, `abort, `cancel], ret) && OnPanic::modified + && !Popup::YesNo (_("Really leave without saving?"))) + { + ret = `again; + } + + // check misconfigurations + if (contains ([`next, `ok, `finish], ret) && start) + { + // don't allow dumps if no device is available + if (regexpmatch((string) UI::QueryWidget (`id (`onpanic), `Value), "^dump") + && (string) UI::QueryWidget (`id (`dumpdevice), `Value) == "") + { + Popup::Notify (_("It is not possible to enable the dump process without a dump device.")); + ret = `again; + } + + // don't allow vmcmd without at least one command + if ((string) UI::QueryWidget (`id (`onpanic), `Value) == "vmcmd" + && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[A-Za-z]{2,}")) + { + Popup::Notify (_("It is not possible to use vmcmd without defining at least one command.")); + ret = `again; + } + + } + } + } while (!contains ([`back, `abort, `cancel, `next, `ok], ret)); + + // commit changes + if (OnPanic::modified && (ret == `next || ret == `ok || ret == `finish)) + { + OnPanic::start = start; + OnPanic::on_panic = (string) UI::QueryWidget (`id (`onpanic), `Value); + OnPanic::delay_min = (integer) UI::QueryWidget (`id (`delayminutes), `Value); + OnPanic::vmcmds = (string) UI::QueryWidget (`id (`vmcmd), `Value); + OnPanic::dump_line = (string) UI::QueryWidget (`id (`dumpdevice), `Value); + } + + return ret; +} + +/** + * The whole sequence + */ +define symbol OnPanicSequence () { + Wizard::CreateDialog (); + Wizard::SetDesktopIcon("onpanic"); + + OnPanic::Read (); + + symbol ret = OnPanicDialog (); + if (ret == `next || ret == `finish || ret == `ok) + { + OnPanic::Write (); + } + + UI::CloseDialog (); + return ret; +} + +/* EOF */ +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org