FileSystems is responsible for setting default_subvol

* The responsability was somehow shared between Storage and FileSystems.
yast · Nov 3, 2016 · f1b7098 · f1b7098
1 parent 130d95b
commit f1b7098
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/modules/FileSystems.rb b/src/modules/FileSystems.rb
@@ -84,7 +84,8 @@ def main
       @possible_root_fs = [:ext2, :ext3, :ext4, :btrfs, :reiser, :xfs]
       @swap_m_points = ["swap"]
       @tmp_m_points = ["/tmp", "/var/tmp"]
-      @default_subvol = "UNDEFINED"
+      self.default_subvol = ProductFeatures.GetStringFeature("partitioning", "btrfs_default_subvolume")
+
 
       @suggest_m_points = []
       @suggest_tmp_points = []
@@ -1449,7 +1450,7 @@ def FileSystems
     def InitSlib(value)
       @sint = value
       if @sint != nil
-        @default_subvol = @sint.getDefaultSubvolName()
+        @sint.setDefaultSubvolName(@default_subvol)
         Builtins.y2milestone(
           "InitSlib used default_subvol:\"%1\"",
           @default_subvol
@@ -2045,10 +2046,9 @@ def AddQuotaOpts(part, fst_opts)
     # @param [String] Default subvolume name. Only "" and "@" are supported.
     # @return [Boolean] True if subvolume was changed; false otherwise.
     def default_subvol=(name)
-      return if @sint.nil?
       if SUPPORTED_DEFAULT_SUBVOLUME_NAMES.include?(name)
         @default_subvol = name
-        @sint.setDefaultSubvolName(name)
+        @sint.setDefaultSubvolName(name) unless @sint.nil?
         true
       else
         log.warn "Unsupported default subvolume name='#{name}'. Ignoring."

diff --git a/src/modules/Storage.rb b/src/modules/Storage.rb
@@ -339,10 +339,6 @@ def InitLibstorage(readonly)
 
       StorageClients.InstallCallbacks(@sint)
 
-      btrfs_default_subvolume = ProductFeatures.GetStringFeature("partitioning",
-                                                                 "btrfs_default_subvolume")
-      @sint.setDefaultSubvolName(btrfs_default_subvolume) if btrfs_default_subvolume
-
       if Stage.initial
         @sint.setDetectMountedVolumes(false)
         @sint.setRootPrefix(Installation.destdir)
@@ -375,7 +371,7 @@ def FinishLibstorage
 
 
     def default_subvolume_name()
-      return @sint.getDefaultSubvolName()
+      FileSystems.default_subvol
     end
 
 

diff --git a/test/storage_test.rb b/test/storage_test.rb
@@ -8,14 +8,23 @@
 Yast.import "StorageInit"
 
 describe "Yast::Storage" do
+  subject { Yast::Storage }
+
   before do
-    Yast::Storage.InitLibstorage(false)
+    subject.InitLibstorage(false)
   end
 
   describe "#SetUserdata" do
     it "sets given user data for a given device" do
       # non-zero error for device that does not exist
-      expect(Yast::Storage.SetUserdata("/dev/ice/does/not/exist", { "/" => "snapshots" })).not_to eq(0)
+      expect(subject.SetUserdata("/dev/ice/does/not/exist", { "/" => "snapshots" })).not_to eq(0)
+    end
+  end
+
+  describe "#default_subvolume_name" do
+    it "returns the default subvolume name according to FileSystems" do
+      expect(Yast::FileSystems).to receive(:default_subvol).and_return("SOME-VALUE")
+      expect(subject.default_subvolume_name).to eq("SOME-VALUE")
     end
   end
 end