Author: thardeck Date: Mon Aug 29 13:40:03 2011 New Revision: 65421 URL: http://svn.opensuse.org/viewcvs/yast?rev=65421&view=rev Log: - updated onpanic dialog to allow 8 vmcmd commands and a total of 128 chars - updated the help texts of the onpanic and dump modules - removed X-KDE-RootOnly=true entry for both modules (bnc#681249) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/clients/dump.desktop trunk/s390/src/clients/onpanic.desktop trunk/s390/src/dump/ui.ycp trunk/s390/src/modules/Dump.ycp trunk/s390/src/modules/OnPanic.ycp trunk/s390/src/onpanic/ui.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Mon Aug 29 13:40:03 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Mon Aug 29 13:40:03 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 29 11:57:31 UTC 2011 - thardeck@suse.com + +- updated onpanic dialog to allow 8 vmcmd commands and a total of 128 chars +- updated the help texts of the onpanic and dump modules +- removed X-KDE-RootOnly=true entry for both modules (bnc#681249) + +------------------------------------------------------------------- Tue Aug 9 14:06:43 UTC 2011 - thardeck@novell.com - extended dump module to support dasd multi-volume dump devices (fate#304024) Modified: trunk/s390/src/clients/dump.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dump.desktop?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/clients/dump.desktop (original) +++ trunk/s390/src/clients/dump.desktop Mon Aug 29 13:40:03 2011 @@ -16,7 +16,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-dump -Exec=xdg-su -c "/sbin/yast2 dump" +Exec=/sbin/yast2 dump Name=Dump Devices GenericName=Configure Dump Devices Modified: trunk/s390/src/clients/onpanic.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/onpanic.desktop?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/clients/onpanic.desktop (original) +++ trunk/s390/src/clients/onpanic.desktop Mon Aug 29 13:40:03 2011 @@ -3,7 +3,6 @@ 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 Modified: trunk/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dump/ui.ycp?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/dump/ui.ycp (original) +++ trunk/s390/src/dump/ui.ycp Mon Aug 29 13:40:03 2011 @@ -16,29 +16,29 @@ import "Wizard"; /** + * Defines the default active device selection (`dasd, `zfcp) + */ +define symbol type = `zfcp; + +/** * 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>"); + 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>DASD and ZFCP devices have to be active to be utilized. This activation can be done in the YaST DASD respective ZFCP dialog.<br>") ++ _("Devices which are in use or have mounted partitions will not be shown.</p>") ++ _("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), @@ -137,6 +137,9 @@ // reinitialize devices ret = `again; } + + // reset screen after dump progress bar + Wizard::SetContentsButtons (caption, `VBox(), help, Label::BackButton (), Label::CreateButton()); } } } @@ -152,16 +155,14 @@ symbol DumpSequence() { symbol ret = nil; // reset dialog if required + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("dump"); 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); + UI::CloseDialog(); return ret; } Modified: trunk/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Dump.ycp?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/modules/Dump.ycp (original) +++ trunk/s390/src/modules/Dump.ycp Mon Aug 29 13:40:03 2011 @@ -1,7 +1,7 @@ /** * File: modules/Dump.ycp * Package: Creation of s390 dump devices - * Summary: Creating dump devices for S/390 + * Summary: Creating s390 dump devices, input and output functions * Authors: Tim Hardeck * */ @@ -17,11 +17,11 @@ /** * DASD devices list of mkdump - */ + */ global define list<string> dasd_disks = [ ]; /** * ZFCP devices list of mkdump - */ + */ global define list<string> zfcp_disks = [ ]; /** Modified: trunk/s390/src/modules/OnPanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/OnPanic.ycp?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/modules/OnPanic.ycp (original) +++ trunk/s390/src/modules/OnPanic.ycp Mon Aug 29 13:40:03 2011 @@ -1,7 +1,7 @@ /** * File: modules/OnPanic.ycp * Package: Configuration of OnPanic - * Summary: Configuration of kernel panic reaction + * Summary: Configuring OnPanic, input and output functions * Authors: Tim Hardeck * * Representation of the dumpconf configuration. @@ -20,9 +20,14 @@ import "Integer"; /** + * Maximal allowed rows for VMCMD? + */ +global const integer VMCMD_MAX_ROWS = 8; + +/** * Maximal allowed characters for VMCMD? */ -global const integer VMCMD_MAX_CHARS = 400; +global const integer VMCMD_MAX_CHARS = 128; /** * Data was modified? @@ -167,7 +172,7 @@ dump_line = ConvertConfToMkdump(dump_device); string config_entry = ""; - foreach(integer i, Integer::RangeFrom(1, 6), { + foreach(integer i, Integer::RangeFrom(1, VMCMD_MAX_ROWS + 1), { config_entry = (string) SCR::Read (.sysconfig.dumpconf + ("VMCMD_" + tostring(i))); if (config_entry != "") { @@ -267,23 +272,22 @@ }); list<string> vmcmd_list = splitstring(vmcmds, "\n"); - foreach(integer i, Integer::RangeFrom(1, 6), { + foreach(integer i, Integer::RangeFrom(1, VMCMD_MAX_ROWS + 1), { 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"); + Service::Restart ("dumpconf"); } else { Service::Disable ("dumpconf"); + Service::Stop ("dumpconf"); } Progress::NextStage(); Modified: trunk/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/ui.ycp?rev=65421&r1=65420&r2=65421&view=diff ============================================================================== --- trunk/s390/src/onpanic/ui.ycp (original) +++ trunk/s390/src/onpanic/ui.ycp Mon Aug 29 13:40:03 2011 @@ -37,14 +37,19 @@ { 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) + if (size(vmcmd_list) > OnPanic::VMCMD_MAX_ROWS) { - vmcmd_list = sublist(vmcmd_list, 0, 5); + vmcmd_list = sublist(vmcmd_list, 0, OnPanic::VMCMD_MAX_ROWS); vmcmds = mergestring(vmcmd_list, "\n"); UI::ChangeWidget (`id(`vmcmd), `Value, vmcmds); - Popup::Notify (_("Only five lines are allowed for VMCMD!")); + Popup::Notify (sformat(_("Only %1 lines are allowed for VMCMD!"), OnPanic::VMCMD_MAX_ROWS)); } + + // allow max chars + newlines + integer vmcmd_max_chars = OnPanic::VMCMD_MAX_CHARS + size(vmcmd_list) - 1; + UI::ChangeWidget( `vmcmd, `InputMaxLength, vmcmd_max_chars); } if (start) @@ -83,25 +88,17 @@ // 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> -"); + 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(r) 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.</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>") ++ sformat(_("<p>With <b>VMCMD</b> CP commands can be specified which are executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"), OnPanic::VMCMD_MAX_ROWS, OnPanic::VMCMD_MAX_CHARS); term content = `HBox (`HSpacing (3), `VBox ( `VSpacing (2), @@ -142,8 +139,8 @@ 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); + // limit the vmcmd size + UI::ChangeWidget( `vmcmd, `InputMaxLength, OnPanic::VMCMD_MAX_CHARS); symbol ret = nil; UpdateScreen(ret); @@ -164,7 +161,7 @@ // if settings were changed don't exit without asking if (contains ([`back, `abort, `cancel], ret) && OnPanic::modified - && !Popup::YesNo (_("Really leave without saving?"))) + && !Popup::ReallyAbort (true)) { ret = `again; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org