Merge pull request #200 from yast/master-bsc-1128707

added home_btrfs_subvolume tag
yast · Mar 12, 2019 · 3375890 · 3375890
2 parents 3b9fd75 + c61c0b7
commit 3375890
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 11 16:22:01 CET 2019 - schubi@suse.de
+
+- Added tag home_btrfs_subvolume to *.rnc file (bsc#1128707)
+- Improved error message layout while creating btrfs subvolumes.
+- 4.1.11
+
 -------------------------------------------------------------------
 Thu Feb 28 14:30:45 CET 2019 - schubi@suse.de
 

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

diff --git a/src/autoyast-rnc/users.rnc b/src/autoyast-rnc/users.rnc
@@ -60,6 +60,7 @@ user = element user {
     u_forename? &
     u_gid? &
     home? &
+    home_btrfs_subvolume? &
     shell? &
     uid? &
     user_password? &
@@ -75,6 +76,7 @@ u_forename = element forename { text }
 surname = element surname { text }
 u_gid = element gid { text }
 home = element home { text }
+home_btrfs_subvolume = element home_btrfs_subvolume { BOOLEAN }
 user_password = element user_password { text }
 username = element username { text }
 uid = element uid { text }

diff --git a/src/modules/UsersRoutines.pm b/src/modules/UsersRoutines.pm
@@ -107,7 +107,7 @@ sub CreateHome {
 	    if ($stdout ne "btrfs") {
 		# TRANSLATORS: %s is a directory name
                 my $error = sprintf(
-                   __(" Cannot create home directory %s. Parent directory is not a Btrfs volume."),
+                   __(" Cannot create home directory %s.\nParent directory is not a Btrfs volume."),
                    $home);
                 Report->Error ($error);
 		return 0