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.

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

Merge post SLE 12 SP1 release changes #55

Merged
merged 4 commits into from
Jan 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions package/yast2-kdump.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 6 15:29:00 UTC 2015 - igonzalezsosa@suse.com

- fix AutoYaST profile schema (bsc#954412)
- 3.1.34.1

-------------------------------------------------------------------
Tue Nov 3 09:44:53 UTC 2015 - ancor@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-kdump.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-kdump
Version: 3.1.34
Version: 3.1.34.1
Release: 0
Summary: Configuration of kdump
License: GPL-2.0
Expand Down
11 changes: 10 additions & 1 deletion src/autoyast-rnc/kdump.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -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 }? &
Expand All @@ -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 }?
}
11 changes: 10 additions & 1 deletion src/modules/Kdump.rb
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ def reset

@DEFAULT_CONFIG = {
"KDUMP_KERNELVER" => "",
"KDUMP_CPUS" => "",
"KDUMP_COMMANDLINE" => "",
"KDUMP_COMMANDLINE_APPEND" => "",
"KEXEC_OPTIONS" => "",
Expand All @@ -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
Expand Down