From dc1c8f169f4ef200509c537bdf717d6258889330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Oct 2015 16:23:04 +0000 Subject: [PATCH 1/2] Fix AutoYaST profile validation * Add some missing elements to the schema. Conflicts: src/Kdump.ycp --- src/autoyast-rnc/kdump.rnc | 11 ++++++++++- src/modules/Kdump.rb | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/autoyast-rnc/kdump.rnc b/src/autoyast-rnc/kdump.rnc index 1c2cbed..e44ec89 100644 --- a/src/autoyast-rnc/kdump.rnc +++ b/src/autoyast-rnc/kdump.rnc @@ -21,8 +21,16 @@ 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 }? & @@ -38,5 +46,6 @@ kdump_general = element KDUMP_SMTP_USER { text }? & element KDUMP_SMTP_PASSWORD { text }? & element KDUMP_NOTIFICATION_TO { text }? & - element KDUMP_NOTIFICATION_CC { text }? + element KDUMP_NOTIFICATION_CC { text }? & + element KDUMP_HOST_KEY { text }? } diff --git a/src/modules/Kdump.rb b/src/modules/Kdump.rb index a36cf11..b6fb89a 100644 --- a/src/modules/Kdump.rb +++ b/src/modules/Kdump.rb @@ -167,6 +167,7 @@ def reset @DEFAULT_CONFIG = { "KDUMP_KERNELVER" => "", + "KDUMP_CPUS" => "", "KDUMP_COMMANDLINE" => "", "KDUMP_COMMANDLINE_APPEND" => "", "KEXEC_OPTIONS" => "", @@ -179,11 +180,19 @@ def reset "KDUMP_VERBOSE" => "3", "KDUMP_DUMPLEVEL" => "31", "KDUMP_DUMPFORMAT" => "lzo", + "KDUMP_CONTINUE_ON_ERROR" => "true", + "KDUMP_REQUIRED_PROGRAMS" => "", + "KDUMP_PRESCRIPT" => "", + "KDUMP_POSTSCRIPT" => "", + "KDUMPTOOL_FLAGS" => "", + "KDUMP_NETCONFIG" => "auto", + "KDUMP_NET_TIMEOUT" => "30", "KDUMP_SMTP_SERVER" => "", "KDUMP_SMTP_USER" => "", "KDUMP_SMTP_PASSWORD" => "", "KDUMP_NOTIFICATION_TO" => "", - "KDUMP_NOTIFICATION_CC" => "" + "KDUMP_NOTIFICATION_CC" => "", + "KDUMP_HOST_KEY" => "" } # map of kdump settings From ff5441aeafc16881e8ed61c406a79d7a1a044d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 6 Nov 2015 15:30:10 +0000 Subject: [PATCH 2/2] Bump version and update changes file --- package/yast2-kdump.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes index e4af8d5..ff6ee66 100644 --- a/package/yast2-kdump.changes +++ b/package/yast2-kdump.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 6 15:29:00 UTC 2015 - igonzalezsosa@suse.com + +- fix AutoYaST profile schema (bsc#954412) + ------------------------------------------------------------------- Tue Nov 3 09:44:53 UTC 2015 - ancor@suse.com