Merge pull request #6 from yast/fix_killing_12

Fix killing 12
yast · Jan 27, 2015 · bcf0c0f · bcf0c0f
2 parents d7d2e20 + 02f5727
commit bcf0c0f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/package/yast2-reipl.changes b/package/yast2-reipl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 26 13:39:42 UTC 2015 - jreidinger@suse.com
+
+- fixed \r character lost during conversion to Ruby
+
 -------------------------------------------------------------------
 Thu Nov  6 12:41:25 CET 2014 - schubi@suse.de
 

diff --git a/src/modules/Reipl.rb b/src/modules/Reipl.rb
@@ -134,19 +134,19 @@ def ReadState
       type = lsreipl_lines[0][/ccw$|fcp$|node$/]
       if type == "ccw"
          ccw_map = configuration["ccw"]
-         ccw_map["device"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[0-3]\.[0-3]\.[\h.]*$/]), "\n ") if lsreipl_lines[1]
-         ccw_map["loadparm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/".*"$/]), "\n \"") if lsreipl_lines[2]
-         ccw_map["parm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/".*"$/]), "\n \"") if lsreipl_lines[3]
+         ccw_map["device"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[0-3]\.[0-3]\.[\h.]*$/]), "\n\r") if lsreipl_lines[1]
+         ccw_map["loadparm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/".*"$/]), "\n\r\"") if lsreipl_lines[2]
+         ccw_map["parm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/".*"$/]), "\n\r\"") if lsreipl_lines[3]
          Ops.set(configuration, "ccw", ccw_map)
       end
       if type == "fcp"
          fcp_map = configuration["fcp"]
-         ccw_map["wwpm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[x\h]*$/]), "\n ") if lsreipl_lines[1]
-         ccw_map["lun"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/[x\h]*$/]), "\n ") if lsreipl_lines[2]
-         ccw_map["device"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/[0-3]\.[0-3]\.[\h.]*$/]), "\n ") if lsreipl_lines[3]
-         ccw_map["bootprog"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[4][/[0-9]*$/]), "\n ") if lsreipl_lines[4]
-         ccw_map["br_lbr"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[5][/[0-9]*$/]), "\n ") if lsreipl_lines[5]
-         ccw_map["bootparms"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[6][/".*"*$/]), "\n \"") if lsreipl_lines[6]
+         ccw_map["wwpm"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[x\h]*$/]), "\n\r") if lsreipl_lines[1]
+         ccw_map["lun"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/[x\h]*$/]), "\n\r") if lsreipl_lines[2]
+         ccw_map["device"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/[0-3]\.[0-3]\.[\h.]*$/]), "\n\r") if lsreipl_lines[3]
+         ccw_map["bootprog"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[4][/[0-9]*$/]), "\n\r") if lsreipl_lines[4]
+         ccw_map["br_lbr"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[5][/[0-9]*$/]), "\n\r") if lsreipl_lines[5]
+         ccw_map["bootparms"] = Builtins.deletechars(Convert.to_string(lsreipl_lines[6][/".*"*$/]), "\n\r\"") if lsreipl_lines[6]
          Ops.set(configuration, "fcp", fcp_map)
       end