Merge remote-tracking branch 'origin/SLE-12-GA' into SLE-12-SP1

yast · Nov 11, 2015 · 2c3a3d6 · 2c3a3d6
2 parents c0d7822 + da69606
commit 2c3a3d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 11 15:48:33 UTC 2015 - lslezak@suse.cz
+
+- Do not check the free space on a CD/DVD mounted medium during
+  online migration (the mount point has been changed from /media to
+  /run/media) (bsc#952112)
+
 -------------------------------------------------------------------
 Wed Oct 21 14:29:50 UTC 2015 - lslezak@suse.cz
 

diff --git a/src/modules/SpaceCalculation.rb b/src/modules/SpaceCalculation.rb
@@ -142,6 +142,7 @@ def EvaluateFreeSpace(spare_percentage)
               mountName != "/dev/shm" &&
               part["spec"] != "udev" &&
               !mountName.start_with?("/media/") &&
+              !mountName.start_with?("/run/media/") &&
               !mountName.start_with?("/var/adm/mount/")
             part_info["name"] = mountName
           end