Merge pull request #1219 from yast/sw_51

ensure mount options are not doubled (bsc#1186298)

package/yast2-storage-ng.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  4 09:51:58 UTC 2021 - Steffen Winterfeldt <snwint@suse.com>
+
+- ensure mount options are not doubled (bsc#1186298)
+- 4.2.117
+
 -------------------------------------------------------------------
 Fri May 21 10:50:11 UTC 2021 - Steffen Winterfeldt <snwint@suse.com>
 

package/yast2-storage-ng.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        4.2.116
+Version:        4.2.117
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only

src/lib/y2storage/planned/can_be_formatted.rb

@@ -208,7 +208,7 @@ def fstab_options_for(mount_point)
             []
           end
         options.push("ro") if read_only && !options.include?("rw")
-        options
+        options.uniq
       end
 
       # Creates subvolumes in the previously created filesystem that is placed

test/y2storage/planned/can_be_formatted_test.rb

@@ -86,9 +86,20 @@ def reuse!(devicegraph)
         planned.read_only = true
       end
 
-      it "sets the 'ro' option" do
+      it "sets the 'ro' option exactly once" do
         planned.format!(blk_device)
-        expect(blk_device.filesystem.mount_options).to include("ro")
+        expect(blk_device.filesystem.mount_options.count { |x| x == "ro" }).to eq(1)
+      end
+
+      context "and fstab options also include the 'ro' flag" do
+        before do
+          planned.fstab_options = ["ro"]
+        end
+
+        it "sets the 'ro' option exactly once" do
+          planned.format!(blk_device)
+          expect(blk_device.filesystem.mount_options.count { |x| x == "ro" }).to eq(1)
+        end
       end
 
       context "but fstab options include the 'rw' flag" do