From 997cd903a80f4715c6dd6f621c1639bf2dc78a17 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 4 Sep 2002 15:45:31 +0000 Subject: (addUser): fix calling with a user already existing (mainly for installs keeping the / non-formatted, special for pixel) --- perl-install/install_steps.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 0159e1e3a..5f329bf12 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -722,8 +722,8 @@ sub addUser { foreach (@$users) { $_->{home} ||= "/home/$_->{name}"; - my $u = $_->{uid} || ($_->{oldu} = (stat("$p$_->{home}"))[4]); - my $g = $_->{gid} || ($_->{oldg} = (stat("$p$_->{home}"))[5]); + my $u = $_->{uid} || ($_->{oldu} = (stat("$p$_->{home}"))[4]) || int getpwnam($_->{name}); + my $g = $_->{gid} || ($_->{oldg} = (stat("$p$_->{home}"))[5]) || int getgrnam($_->{name}); #- search for available uid above 501 else initscripts may fail to change language for KDE. if (!$u || getpwuid($u)) { for ($u = 501; getpwuid($u) || $uids{$u}; $u++) {} } if (!$g) { for ($g = 501; getgrgid($g) || $gids{$g}; $g++) {} } -- cgit v1.2.1