Merge pull request #229 from shundhammer/huha-fix-volume-already-in-use

Don't try to format a partition with file system type 'unknown'
yast · Sep 14, 2016 · f1149ff · f1149ff
2 parents 2d699c4 + 28bcb55
commit f1149ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 14 10:50:26 CEST 2016 - shundhammer@suse.de
+
+- Don't try to format a partition with file system type 'unknown'
+  (bsc#996007)
+- 3.1.103
+
 -------------------------------------------------------------------
 Fri Aug 26 08:18:42 UTC 2016 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-storage.spec b/package/yast2-storage.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.102
+Version:        3.1.103
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Storage.rb b/src/modules/Storage.rb
@@ -1368,7 +1368,7 @@ def volumeMap(vinfo, p)
       Ops.set(p, "used_fs", fs) if fs != :unknown
       fs = toSymbol(FileSystems.conv_fs, vinfo.detected_fs)
       Ops.set(p, "detected_fs", fs)
-      Ops.set(p, "format", true) if vinfo.format
+      Ops.set(p, "format", true) if vinfo.format && fs != :unknown
       Ops.set(p, "create", true) if vinfo.create
       tmp = vinfo.mount
       if !Builtins.isempty(tmp)