Merge pull request #179 from yast/norecovery_mount_SP3

yast · Aug 4, 2022 · 9750991 · 9750991
2 parents 4814c0e + c016294
commit 9750991
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 14 17:20:32 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Use the "norecovery" mount option when searching the root
+  partitions (bsc#1195894)
+- 4.3.4
+
 -------------------------------------------------------------------
 Fri Jul 23 08:56:04 UTC 2021 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        4.3.3
+Version:        4.3.4
 Release:        0
 Summary:        YaST2 - Update
 Group:          System/YaST

diff --git a/src/modules/RootPart.rb b/src/modules/RootPart.rb
@@ -37,6 +37,9 @@ class RootPartClass < Module
     include Logger
     NON_MODULAR_FS = ["devtmpfs", "none", "proc", "sysfs"].freeze
 
+    # filesystems which support the "norecovery" mount options
+    NORECOVERY_FS = [:btrfs, :ext3, :ext4, :xfs].freeze
+
     def main
       Yast.import "UI"
 
@@ -1526,13 +1529,16 @@ def CheckPartition(filesystem)
           SCR.Execute(path(".target.modprobe"), mount_type, "")
         end
 
+        mount_options = ["ro"]
+        mount_options << "norecovery" if NORECOVERY_FS.include?(freshman[:fs])
+
         # mount (read-only) partition to Installation::destdir
-        log.debug("Mounting #{[p_dev, Installation.destdir, Installation.mountlog].inspect}")
+        log.info "Mounting #{p_dev} with options #{mount_options}"
         mount =
           SCR.Execute(
             path(".target.mount"),
             [p_dev, Installation.destdir, Installation.mountlog],
-            "-o ro"
+            "-o #{mount_options.join(",")}"
           )
 
         if Convert.to_boolean(mount)

diff --git a/test/root_part_test.rb b/test/root_part_test.rb
@@ -380,4 +380,35 @@
       end
     end
   end
+
+  describe "#CheckPartition" do
+    before do
+      stub_storage(scenario)
+      allow(Yast::SCR).to receive(:Execute)
+    end
+
+    let(:scenario) { "two-disks-two-btrfs.xml" }
+
+    it "uses 'norecovery' mount option for Btrfs" do
+      # return failure to avoid scanning for /etc/fstab
+      expect(Yast::SCR).to receive(:Execute)
+        .with(Yast.path(".target.mount"), Array, "-o ro,norecovery")
+        .and_return(false)
+
+      fs = Y2Storage::StorageManager.instance.probed.blk_filesystems.first
+      subject.CheckPartition(fs)
+    end
+
+    it "does not use 'norecovery` mount option for Ext2" do
+      # return failure to avoid scanning for /etc/fstab
+      expect(Yast::SCR).to receive(:Execute)
+        .with(Yast.path(".target.mount"), Array, "-o ro")
+        .and_return(false)
+
+      fs = Y2Storage::StorageManager.instance.probed.blk_filesystems.first
+      allow(fs).to receive(:type).and_return(Y2Storage::Filesystems::Type::EXT2)
+
+      subject.CheckPartition(fs)
+    end
+  end
 end