Merge branch 'master' of github.com:yast/yast-bootloader into cleaning

Conflicts: package/yast2-bootloader.changes
yast · Apr 15, 2014 · cad9a24 · cad9a24
2 parents f92ef56 + b2c7e31
commit cad9a24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
-Fri Apr 11 14:38:17 UTC 2014 - jreidinger@suse.com
+Tue Apr 15 10:38:17 UTC 2014 - jreidinger@suse.com
 
 - cleaning up deprecated code to improve stability and maintenance
   of code
-- 3.1.22
+- 3.1.23
+
+-------------------------------------------------------------------
+Tue Apr 15 08:33:29 UTC 2014 - mchang@suse.com
+
+- remove error if boot directory on xfs file system (bnc#864370)
+- 3.1.22 
 
 -------------------------------------------------------------------
 Thu Apr 10 11:18:51 UTC 2014 - jreidinger@suse.com

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.22
+Version:        3.1.23
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootSupportCheck.rb b/src/modules/BootSupportCheck.rb
@@ -225,20 +225,9 @@ def check_BootDevice
                 )
               end
             end
-            if Ops.get(p, "used_fs") == :xfs
-              AddNewProblem(
-                _(
-                  "The /boot directory is on an XFS filesystem. System may not boot."
-                )
-              )
-              Builtins.y2error("The /boot directory is on an XFS filesystem")
-              result = false
-              raise Break
-            else
-              found_boot = true
-              Builtins.y2milestone("/boot filesystem is OK")
-              raise Break
-            end
+            found_boot = true
+            Builtins.y2milestone("/boot filesystem is OK")
+            raise Break
           end
         end
         raise Break if !result || found_boot