fix for bsc#919980

package/yast2-storage.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 03 11:38:11 CET 2015 - dvaleev@suse.com
+
+- allow BootMount on RAID1 (bsc#919980)
+- version 3.1.54
+
 -------------------------------------------------------------------
 Mon Feb 16 11:38:11 CET 2015 - aschnell@suse.de
 

src/include/partitioning/custom_part_lib.rb

@@ -73,9 +73,9 @@ def check_lvm_mount_points(mount)
     # @param [String] mount mount point
     # @return [Boolean]
     #
-    def check_raid_mount_points(mount)
+    def check_raid_mount_points(mount, raid_level)
       not_allowed_raid_mount_points = []
-      if Arch.ppc || Arch.s390
+      if (Arch.ppc && raid_level != "raid1") || Arch.s390
         not_allowed_raid_mount_points = Builtins.add(
           not_allowed_raid_mount_points,
           Partitions.BootMount
@@ -360,7 +360,7 @@ def CheckOkMount(dev, old, new)
           Ops.set(ret, "field", :mount_point)
         end
         if Ops.get_symbol(new, "type", :primary) == :sw_raid
-          if !check_raid_mount_points(Ops.get_string(new, "mount", ""))
+          if !check_raid_mount_points(Ops.get_string(new, "mount", ""), Ops.get_string(new, "raid_type", ""))
             Ops.set(ret, "ok", false)
             Ops.set(ret, "field", :mount_point)
           end

test/Makefile.am

@@ -4,7 +4,8 @@
 
 TESTS =									\
 	storage_snapper_configure_snapper_test.rb			\
-	storage_get_disk_partition.rb
+	storage_get_disk_partition.rb					\
+	storage_boot_on_raid1.rb
 
 TEST_EXTENSIONS = .rb
 RB_LOG_COMPILER = rspec

test/storage_boot_on_raid1.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env rspec
+
+$LOAD_PATH.unshift File.expand_path('../../src', __FILE__)
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+require "include/partitioning/custom_part_lib"
+
+class CustomPartLib < Yast::Client
+  include Singleton
+  def initialize
+    Yast.include self, "partitioning/custom_part_lib.rb"
+  end
+end
+
+Yast.import "Arch"
+Yast.import "Partitions"
+
+describe "CustomPartLib#CheckOkMount" do
+
+
+  it "/boot is only possible with RAID1 on PowerPC" do
+
+    allow(Yast::Arch).to receive(:architecture).and_return("ppc")
+    allow(Yast::Partitions).to receive(:EfiBoot).and_return(false)
+
+    expect(CustomPartLib.instance.check_raid_mount_points("/boot", "raid1")).to eq true
+  end
+
+  it "We cannot put /boot/zipl on any RAID" do
+
+    allow(Yast::Arch).to receive(:architecture).and_return("s390_64")
+    allow(Yast::Partitions).to receive(:EfiBoot).and_return(false)
+
+    expect(CustomPartLib.instance.check_raid_mount_points("/boot/zipl", "raid1")).to eq false
+  end
+
+  it "x86 can boot with /boot on RAID1 " do
+
+    allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
+    allow(Yast::Partitions).to receive(:EfiBoot).and_return(false)
+
+    expect(CustomPartLib.instance.check_raid_mount_points("/boot", "raid1")).to eq true
+  end
+
+end