Merge pull request #160 from yast/backport-root_password

Root password
yast · Jun 5, 2018 · 876e2da · 876e2da
2 parents 380d267 + 075d465
commit 876e2da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  4 14:04:17 UTC 2018 - jreidinger@suse.com
+
+- Fix import of RootPassword if user is specified in autoyast
+  profile (bsc#1081958)
+- 3.2.16
+
 -------------------------------------------------------------------
 Fri Apr  6 13:34:48 UTC 2018 - igonzalezsosa@suse.com
 

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

diff --git a/src/modules/Users.pm b/src/modules/Users.pm
@@ -6371,9 +6371,13 @@ sub Import {
 
 	    my $pw = Linuxrc->InstallInf ("RootPassword");
 	    if (defined $pw){
+                # ensure that even if no user is defined, root will be written
+                $users_modified	= 1;
 
-		$root_user{"userPassword"}	=
-		    $self->CryptPassword ($pw, "system");
+		y2milestone ("updating root password from install.inf");
+		$root_user{"userPassword"} = $self->CryptPassword ($pw, "system");
+                # mark that password is already encrypted, so it does not encrypt twice (bsc#1081958)
+		$root_user{"encrypted"} = 1;
 
 		$users{"system"}{"root"}		= \%root_user;
 		$shadow{"system"}{"root"} = $self->CreateShadowMap(\%root_user);