From 8ef2e28d58f0a0d2c240995bcbb57cbecdfeb849 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 11:10:09 +0200 Subject: [PATCH 1/3] allow optional types for string and map --- src/autoyast-rnc/kdump.rnc | 69 +++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/src/autoyast-rnc/kdump.rnc b/src/autoyast-rnc/kdump.rnc index 77632e9..8656772 100644 --- a/src/autoyast-rnc/kdump.rnc +++ b/src/autoyast-rnc/kdump.rnc @@ -2,18 +2,22 @@ default namespace = "http://www.suse.com/1.0/yast2ns" namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" +include "common.rnc" kdump = element kdump { + MAP, + ( (kdump_crash_kernel_value | kdump_crash_kernel_list)? & # parameter specify crashkernel value for xen hypervisor (kdump_crash_xen_kernel_value | kdump_crash_xen_kernel_list)? & kdump_add_crash_kernel? & kdump_general? + ) } -kdump_crash_kernel_value = element crash_kernel { text } -kdump_crash_xen_kernel_value = element crash_xen_kernel { text } +kdump_crash_kernel_value = element crash_kernel { STRING } +kdump_crash_xen_kernel_value = element crash_xen_kernel { STRING } kdump_crash_kernel_list = element crash_kernel { LIST, kdump_crash_kernel_entry+ @@ -22,37 +26,40 @@ kdump_crash_xen_kernel_list = element crash_xen_kernel { LIST, kdump_crash_kernel_entry+ } -kdump_crash_kernel_entry = element listentry { text } +kdump_crash_kernel_entry = element listentry { STRING } kdump_add_crash_kernel = element add_crash_kernel { BOOLEAN } kdump_general = element general { - element KDUMP_KERNELVER { text }? & - element KDUMP_CPUS { text }? & - element KDUMP_COMMANDLINE { text }? & - element KDUMP_COMMANDLINE_APPEND { text }? & - element KDUMP_CONTINUE_ON_ERROR { text }? & - element KDUMP_REQUIRED_PROGRAMS { text }? & - element KDUMP_PRESCRIPT { text }? & - element KDUMP_POSTSCRIPT { text }? & - element KDUMPTOOL_FLAGS { text }? & - element KDUMP_NETCONFIG { text }? & - element KDUMP_NET_TIMEOUT { text }? & - element KDUMP_COPY_KERNEL { text }? & - element KEXEC_OPTIONS { text }? & - element KDUMP_RUNLEVEL { text }? & - element KDUMP_IMMEDIATE_REBOOT { text }? & - element KDUMP_TRANSFER { text }? & - element KDUMP_SAVEDIR { text }? & - element KDUMP_KEEP_OLD_DUMPS { text }? & - element KDUMP_FREE_DISK_SIZE { text }? & - element KDUMP_VERBOSE { text }? & - element KDUMP_DUMPLEVEL { text }? & - element KDUMP_DUMPFORMAT { text }? & - element KDUMP_SMTP_SERVER { text }? & - element KDUMP_SMTP_USER { text }? & - element KDUMP_SMTP_PASSWORD { text }? & - element KDUMP_NOTIFICATION_TO { text }? & - element KDUMP_NOTIFICATION_CC { text }? & - element KDUMP_HOST_KEY { text }? + MAP, + ( + element KDUMP_KERNELVER { STRING }? & + element KDUMP_CPUS { STRING }? & + element KDUMP_COMMANDLINE { STRING }? & + element KDUMP_COMMANDLINE_APPEND { STRING }? & + element KDUMP_CONTINUE_ON_ERROR { STRING }? & + element KDUMP_REQUIRED_PROGRAMS { STRING }? & + element KDUMP_PRESCRIPT { STRING }? & + element KDUMP_POSTSCRIPT { STRING }? & + element KDUMPTOOL_FLAGS { STRING }? & + element KDUMP_NETCONFIG { STRING }? & + element KDUMP_NET_TIMEOUT { STRING }? & + element KDUMP_COPY_KERNEL { STRING }? & + element KEXEC_OPTIONS { STRING }? & + element KDUMP_RUNLEVEL { STRING }? & + element KDUMP_IMMEDIATE_REBOOT { STRING }? & + element KDUMP_TRANSFER { STRING }? & + element KDUMP_SAVEDIR { STRING }? & + element KDUMP_KEEP_OLD_DUMPS { STRING }? & + element KDUMP_FREE_DISK_SIZE { STRING }? & + element KDUMP_VERBOSE { STRING }? & + element KDUMP_DUMPLEVEL { STRING }? & + element KDUMP_DUMPFORMAT { STRING }? & + element KDUMP_SMTP_SERVER { STRING }? & + element KDUMP_SMTP_USER { STRING }? & + element KDUMP_SMTP_PASSWORD { STRING }? & + element KDUMP_NOTIFICATION_TO { STRING }? & + element KDUMP_NOTIFICATION_CC { STRING }? & + element KDUMP_HOST_KEY { STRING }? + ) } From 8809bce39ac4bd82ad3e5d9cf461a58f94204111 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 11:10:54 +0200 Subject: [PATCH 2/3] Changes --- .travis.yml | 2 +- package/yast2-kdump.changes | 7 +++++++ package/yast2-kdump.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbdf7f6..a935b79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ before_install: script: # the "yast-travis-ruby" script is included in the base yastdevel/ruby image # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-kdump-image yast-travis-ruby + - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-kdump-image yast-travis-ruby diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes index ae41cbb..6ef9cf6 100644 --- a/package/yast2-kdump.changes +++ b/package/yast2-kdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 12 09:10:14 UTC 2020 - Josef Reidinger + +- Autoyast schema: Allow optional types for string and map objects + (bsc#1170886) +- 4.3.0 + ------------------------------------------------------------------- Tue Feb 18 11:35:05 UTC 2020 - Stefan Hundhammer diff --git a/package/yast2-kdump.spec b/package/yast2-kdump.spec index b61eb40..4e16cb7 100644 --- a/package/yast2-kdump.spec +++ b/package/yast2-kdump.spec @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 4.2.9 +Version: 4.3.0 Release: 0 Summary: Configuration of kdump License: GPL-2.0-only From d3e1e4eda0b35e77d564564c669c6b547dbc4446 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 13:51:45 +0200 Subject: [PATCH 3/3] fix formatting --- src/autoyast-rnc/kdump.rnc | 83 +++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/src/autoyast-rnc/kdump.rnc b/src/autoyast-rnc/kdump.rnc index 8656772..ec91174 100644 --- a/src/autoyast-rnc/kdump.rnc +++ b/src/autoyast-rnc/kdump.rnc @@ -8,58 +8,57 @@ kdump = element kdump { MAP, ( - (kdump_crash_kernel_value | kdump_crash_kernel_list)? & - # parameter specify crashkernel value for xen hypervisor - (kdump_crash_xen_kernel_value | kdump_crash_xen_kernel_list)? & - kdump_add_crash_kernel? & - kdump_general? + (kdump_crash_kernel_value | kdump_crash_kernel_list)? & + # parameter specify crashkernel value for xen hypervisor + (kdump_crash_xen_kernel_value | kdump_crash_xen_kernel_list)? & + kdump_add_crash_kernel? & + kdump_general? ) } kdump_crash_kernel_value = element crash_kernel { STRING } kdump_crash_xen_kernel_value = element crash_xen_kernel { STRING } kdump_crash_kernel_list = element crash_kernel { - LIST, - kdump_crash_kernel_entry+ + LIST, + kdump_crash_kernel_entry+ } kdump_crash_xen_kernel_list = element crash_xen_kernel { - LIST, - kdump_crash_kernel_entry+ + LIST, + kdump_crash_kernel_entry+ } kdump_crash_kernel_entry = element listentry { STRING } kdump_add_crash_kernel = element add_crash_kernel { BOOLEAN } -kdump_general = - element general { - MAP, - ( - element KDUMP_KERNELVER { STRING }? & - element KDUMP_CPUS { STRING }? & - element KDUMP_COMMANDLINE { STRING }? & - element KDUMP_COMMANDLINE_APPEND { STRING }? & - element KDUMP_CONTINUE_ON_ERROR { STRING }? & - element KDUMP_REQUIRED_PROGRAMS { STRING }? & - element KDUMP_PRESCRIPT { STRING }? & - element KDUMP_POSTSCRIPT { STRING }? & - element KDUMPTOOL_FLAGS { STRING }? & - element KDUMP_NETCONFIG { STRING }? & - element KDUMP_NET_TIMEOUT { STRING }? & - element KDUMP_COPY_KERNEL { STRING }? & - element KEXEC_OPTIONS { STRING }? & - element KDUMP_RUNLEVEL { STRING }? & - element KDUMP_IMMEDIATE_REBOOT { STRING }? & - element KDUMP_TRANSFER { STRING }? & - element KDUMP_SAVEDIR { STRING }? & - element KDUMP_KEEP_OLD_DUMPS { STRING }? & - element KDUMP_FREE_DISK_SIZE { STRING }? & - element KDUMP_VERBOSE { STRING }? & - element KDUMP_DUMPLEVEL { STRING }? & - element KDUMP_DUMPFORMAT { STRING }? & - element KDUMP_SMTP_SERVER { STRING }? & - element KDUMP_SMTP_USER { STRING }? & - element KDUMP_SMTP_PASSWORD { STRING }? & - element KDUMP_NOTIFICATION_TO { STRING }? & - element KDUMP_NOTIFICATION_CC { STRING }? & - element KDUMP_HOST_KEY { STRING }? - ) +kdump_general = element general { + MAP, + ( + element KDUMP_KERNELVER { STRING }? & + element KDUMP_CPUS { STRING }? & + element KDUMP_COMMANDLINE { STRING }? & + element KDUMP_COMMANDLINE_APPEND { STRING }? & + element KDUMP_CONTINUE_ON_ERROR { STRING }? & + element KDUMP_REQUIRED_PROGRAMS { STRING }? & + element KDUMP_PRESCRIPT { STRING }? & + element KDUMP_POSTSCRIPT { STRING }? & + element KDUMPTOOL_FLAGS { STRING }? & + element KDUMP_NETCONFIG { STRING }? & + element KDUMP_NET_TIMEOUT { STRING }? & + element KDUMP_COPY_KERNEL { STRING }? & + element KEXEC_OPTIONS { STRING }? & + element KDUMP_RUNLEVEL { STRING }? & + element KDUMP_IMMEDIATE_REBOOT { STRING }? & + element KDUMP_TRANSFER { STRING }? & + element KDUMP_SAVEDIR { STRING }? & + element KDUMP_KEEP_OLD_DUMPS { STRING }? & + element KDUMP_FREE_DISK_SIZE { STRING }? & + element KDUMP_VERBOSE { STRING }? & + element KDUMP_DUMPLEVEL { STRING }? & + element KDUMP_DUMPFORMAT { STRING }? & + element KDUMP_SMTP_SERVER { STRING }? & + element KDUMP_SMTP_USER { STRING }? & + element KDUMP_SMTP_PASSWORD { STRING }? & + element KDUMP_NOTIFICATION_TO { STRING }? & + element KDUMP_NOTIFICATION_CC { STRING }? & + element KDUMP_HOST_KEY { STRING }? + ) }