Merge branch 'SLE-12-SP2-CASP' into aio-master

yast · Jan 30, 2017 · c06fd42 · c06fd42
2 parents 613db23 + 725bf91
commit c06fd42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 25 13:01:58 UTC 2017 - mvidner@suse.com
+
+- Implement simple_mode -> label_proposal (FATE#322328)
+- 3.2.1
+
 -------------------------------------------------------------------
 Thu Oct 27 13:33:19 UTC 2016 - jreidinger@suse.com
 

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

diff --git a/src/clients/kdump_proposal.rb b/src/clients/kdump_proposal.rb
@@ -44,6 +44,7 @@ def main
 
         @ret = {
           "raw_proposal" => Kdump.Summary,
+          "label_proposal" => Kdump.Summary[0..0],
           # FATE#317488 When expectation at the end of proposal does not match
           # the value, this proposal will be called again
           "trigger"      => {

diff --git a/src/modules/Kdump.rb b/src/modules/Kdump.rb
@@ -65,6 +65,7 @@ def main
       Yast.import "FileUtils"
       Yast.import "Directory"
       Yast.import "String"
+      Yast.import "SpaceCalculation"
 
       reset
     end