Merge f690682 into 3874c4e

yast · Nov 6, 2015 · b2b0954 · b2b0954
2 parents 3874c4e + f690682
commit b2b0954
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -5,4 +5,5 @@ Yast::Tasks.submit_to :sle12sp1
 Yast::Tasks.configuration do |conf|
   #lets ignore license check for now
   conf.skip_license_check << /.*/
+  conf.obs_sr_project = "SUSE:SLE-12-SP1:Update"
 end
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  6 15:29:00 UTC 2015 - igonzalezsosa@suse.com
+
+- fix AutoYaST profile schema (bsc#805275)
+- 3.1.35
+
 -------------------------------------------------------------------
 Tue Nov  3 09:44:53 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-kdump.spec b/package/yast2-kdump.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.1.34
+Version:        3.1.35
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0

diff --git 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
@@ -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 <string, string > of kdump settings