Merge pull request #77 from imobach/add-no_groups-element

Add some missing elements to AutoYaST schema
yast · Nov 19, 2015 · 5b039ae · 5b039ae
2 parents ab9a3b9 + fc952e9
commit 5b039ae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 18 08:48:16 UTC 2015 - igonzalezsosa@suse.com
+
+- add some missing elements to AutoYaST schema (bsc#954412)
+- 3.1.37.2
+
 -------------------------------------------------------------------
 Mon Nov  9 10:52:39 UTC 2015 - igonzalezsosa@suse.com
 

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

diff --git a/src/autoyast-rnc/users.rnc b/src/autoyast-rnc/users.rnc
@@ -29,6 +29,7 @@ user_defaults =
     ud_groups? & 
     home? & 
     inactive? & 
+    no_groups? &
     shell? & 
     skel? &
     umask?
@@ -37,12 +38,15 @@ expire = element expire { text }
 ud_group = element group { text }
 ud_groups = element groups { text }
 inactive = element inactive { text }
+no_groups = element no_groups { BOOLEAN }
 shell = element shell { text }
 skel = element skel { text }
 umask = element umask { text }
 user = element user {
     encrypted? &
     fullname? &
+    surname? &
+    u_forename? &
     u_gid? &
     home? &
     shell? &
@@ -55,6 +59,8 @@ user = element user {
 }
 encrypted = element encrypted { BOOLEAN }
 fullname = element fullname { text }
+u_forename = element forename { text }
+surname = element surname { text }
 u_gid = element gid { text }
 home = element home { text }
 user_password = element user_password { text }