Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Schema change #115

Merged
merged 3 commits into from
May 12, 2020
Merged

Schema change #115

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ef2e28
allow optional types for string and map
jreidinger May 12, 2020
8809bce
Changes
jreidinger May 12, 2020
d3e1e4e
fix formatting
jreidinger May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions package/yast2-kdump.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 12 09:10:14 UTC 2020 - Josef Reidinger <jreidinger@suse.com>

- 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 <shundhammer@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-kdump.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
69 changes: 38 additions & 31 deletions src/autoyast-rnc/kdump.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the indentation OK? I would say that it is slightly different to the used for the general section.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I worry this use old ycp indentation rule with 4 width and every second indent is tab, so it creates some fancy indentation. If you are fine, I can unify it to have 2 space everywhere

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am fine with that. Thanks.

(
(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+
Expand All @@ -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 }?
)
}