Merge pull request #35 from jsuchome/save_autologin_aliases

- save Autologin settings at the end of installation (bnc#863436)
yast · Feb 21, 2014 · c935cd4 · c935cd4
2 parents a42a771 + e9a5aa1
commit c935cd4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 20 10:46:56 CET 2014 - jsuchome@suse.cz
+
+- save Autologin settings at the end of installation (bnc#863436)
+- 3.1.11
+
 -------------------------------------------------------------------
 Tue Feb 18 11:14:05 CET 2014 - jsuchome@suse.cz
 

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

diff --git a/src/clients/users_finish.rb b/src/clients/users_finish.rb
@@ -34,6 +34,7 @@ class UsersFinishClient < Client
     def main
       textdomain "users"
 
+      Yast.import "Autologin"
       Yast.import "Users"
       Yast.import "UsersSimple"
 
@@ -82,6 +83,14 @@ def main
 
           create_users(@users)
 
+          if UsersSimple.AutologinUsed
+            Autologin.user = UsersSimple.GetAutologinUser
+            Autologin.Use(true)
+          end
+
+          root_alias = UsersSimple.GetRootAlias
+          Users.AddRootAlias(root_alias) unless root_alias.empty?
+
           Users.Write
         end
       else