Merge pull request #262 from ancorgs/workaround_945479_sle12

Workaround for bnc#945479 in SLE12

package/yast2-bootloader.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 11 16:46:11 UTC 2015 - ancor@suse.com
+
+- Empty kernel command lines are now properly written (bnc#945479)
+
 -------------------------------------------------------------------
 Thu Jun  4 08:19:26 UTC 2015 - jreidinger@suse.com
 

src/include/bootloader/routines/misc.rb

@@ -478,6 +478,8 @@ def kernel_param_key(value)
     # @return [String] new kernel command line
     def setKernelParamToLine(line, key, value)
       line ||= ""
+      # bnc#945479, see last line of this method
+      line = "" if line == '""'
       # FIXME this doesn't work with quotes and spaces
       params = line.split(" ").reject(&:empty?)
       # count occurences of every parameter, initial value is 0
@@ -513,7 +515,8 @@ def setKernelParamToLine(line, key, value)
           params << Builtins.sformat("%1=%2", key, value)
         end
       end
-      params.join(" ")
+      # bnc#945479 perl-bootloader does not cope well with empty strings
+      params.empty? ? '""' : params.join(" ")
     end
 
 

test/boot_common_test.rb

@@ -65,11 +65,11 @@ def expect_set(key: nil, val: nil, old: nil, new: nil)
                  new: "verbose")
     end
 
-    it "return empty string when value is \"false\" and line is nil" do
+    it "return quoted empty string when value is \"false\" and line is nil" do
       expect_set(key: "verbose",
                  val: "false",
                  old: nil,
-                 new: "")
+                 new: '""')
     end
   end
 end

test/grub2pwd_test.rb

@@ -16,7 +16,7 @@ def mock_file_presence(exists)
   describe "#used?" do
     it "return true if exists file #{GRUB2Pwd::PWD_ENCRYPTION_FILE}" do
       mock_file_presence(true)
-      expect(subject.used?).to be_true
+      expect(subject.used?).to eq true
     end
   end