Merge pull request #594 from shundhammer/huha-merge-fs-type

Merged CASP branch to to SP3
yast · Aug 17, 2017 · 2fbc9e0 · 2fbc9e0
2 parents 373422e + b3be6e6
commit 2fbc9e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/doc/control-file.md b/doc/control-file.md
@@ -1021,6 +1021,12 @@ property should be set to _true_. This works only for Btrfs root
 filesystems. If another root filesystem type is chosen, this might fail
 silently.
 
+*root_fs* (string, default _btrfs_) is the filesystem type for the root
+ partition.
+
+*home_fs* (string, default _xfs_) is the filesystem type for the home
+ partition.
+
 *home_path* (string) is the path (mount point) for the home
 partition or volume, if any is created (depending on *try_separate_home*,
 *limit_try_home* and available disk space).

diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 17 15:16:05 CEST 2017 - shundhammer@suse.de
+
+- Merged SLE-12-SP2-CASP branch to SLE-12-SP3 branch:
+  Make filesystem type for home and root configurable in control.xml
+  (bsc#1051762)
+- 3.2.49
+
 -------------------------------------------------------------------
 Tue Aug  8 10:57:46 CEST 2017 - shundhammer@suse.de
 

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