Improved text (label/helptext) for kdump low/high memory usage.

yast · Feb 6, 2020 · 190eb19 · 190eb19
1 parent 42a3c4b
commit 190eb19
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb  6 13:11:35 CET 2020 - schubi@suse.de
+
+- Improved text (label/helptext) for kdump low/high memory usage.
+  (bsc#1153940)
+- 4.2.8
+
 -------------------------------------------------------------------
 Wed Jan  8 14:25:28 CET 2020 - schubi@suse.de
 

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

diff --git a/src/include/kdump/dialogs.rb b/src/include/kdump/dialogs.rb
@@ -531,7 +531,7 @@ def kdump_memory_widget
       else
         _("Kdump Memor&y [MiB]")
       end
-      low_range = format(_("(%{min} - %{max}, default: %{default})"),
+      low_range = format(_("(min:%{min}; max:%{max}; suggested: %{default})"),
         min:     low_min,
         max:     low_max,
         default: low_default)
@@ -564,7 +564,7 @@ def kdump_memory_widget
         high_min = Kdump.memory_limits[:min_high].to_i
         high_max = Kdump.memory_limits[:max_high].to_i
         high_default = Kdump.memory_limits[:default_high].to_i
-        high_range = format(_("(%{min} - %{max}, default: %{default})"),
+        high_range = format(_("(min:%{min}; max:%{max}; suggested: %{default})"),
           min:     high_min,
           max:     high_max,
           default: high_default)

diff --git a/src/include/kdump/helps.rb b/src/include/kdump/helps.rb
@@ -40,8 +40,16 @@ def initialize_kdump_helps(_include_target)
         ),
         # Kdump Memor&y [MB] - IntField 1/1
         "KdumpMemory"            => _(
-          "<p><b>Kdump Memory</b><br>\n    Allocation of memory for kdump kernel. <br></p>\n"
-        ),
+          "<p><b>Kdump Memory</b><br>\n    Allocation of memory for kdump kernel.</p>"
+        ) +
+          _("<p>On AMD64/Intel 64 computers, the <i>High</i> value stands for the memory reservation for all " \
+            "available memory. The <i>Low</i> value stands for the memory reservation in the DMA32 zone, that "\
+            "is, all the memory up to the 4 GB mark.<br>\n" \
+            "<i>Low</i> is the amount of memory required by 32-bit-only devices. The kernel will allocate " \
+            "64M for DMA32 bounce buffers. If your server does not have any 32-bit-only devices, " \
+            "everything should work with the default allocation of 72M for <i>Low</i>. A possible " \
+            "exception to this is on NUMA machines, which may make it appear that more Low memory is needed. " \
+            "The Kdump kernel may be booted with numa=off to make sure normal kernel allocations do not use <i>Low</i> memory."),
         # fadump
         "FADump"                 => _(
           # T: help text for a combo box