Merge pull request #83 from imobach/merge-sle-12-sp1-into-master

Merge SLE 12 SP1 into master
yast · Jan 14, 2016 · 3b8d1e6 · 3b8d1e6
2 parents 55d74e4 + 210a8d1
commit 3b8d1e6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,10 +1,17 @@
+-------------------------------------------------------------------
+Wed Nov 18 08:48:16 UTC 2015 - igonzalezsosa@suse.com
+
+- fix validation of AutoYaST profiles (bsc#954412)
+- 3.1.41
+
 -------------------------------------------------------------------
 Tue Sep  1 15:29:38 UTC 2015 - igonzalezsosa@suse.com
 
 - Move users creation to first stage during autoinstallation,
   so it is not needed to run the 2nd stage to have a minimal system
   (bnc#892091)
 - 3.1.40
+
 -------------------------------------------------------------------
 Thu Jul  2 20:49:05 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.40
+Version:        3.1.41
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/autoyast-rnc/users.rnc b/src/autoyast-rnc/users.rnc
@@ -15,6 +15,7 @@ groups =
     gr_group*
   }
 gr_group = element group {
+    encrypted? &
     element group_password { text }? &
     element groupname      { text }? &
     element userlist       { text }? &
@@ -28,18 +29,24 @@ user_defaults =
     ud_groups? & 
     home? & 
     inactive? & 
+    no_groups? &
     shell? & 
-    skel?
+    skel? &
+    umask?
   }
 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? &
@@ -52,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 }