From ebf8b4f27c85fce7f150373e4390002a12cd335a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 5 Jun 2001 16:38:06 +0000 Subject: (addUser): accept gid's which already exist, and don't them in /etc/group (for auto installs) --- perl-install/install_steps.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 2b6eb83fb..7e0d3f3f4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -589,7 +589,7 @@ sub addUser { my $g = $_->{gid} || ($_->{oldg} = (stat("$p$_->{home}"))[5]); #- 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 || getgrgid($g)) { for ($g = 501; getgrgid($g) || $gids{$g}; $g++) {} } + if (!$g ) { for ($g = 501; getgrgid($g) || $gids{$g}; $g++) {} } $_->{uid} = $u; $uids{$u} = 1; $_->{gid} = $g; $gids{$g} = 1; @@ -598,7 +598,7 @@ sub addUser { any::write_passwd_user($p, $_, $o->{authentication}{md5}) foreach @$users; open F, ">> $p/etc/group" or die "can't append to group file: $!"; - print F "$_->{name}:x:$_->{gid}:\n" foreach @$users; + print F "$_->{name}:x:$_->{gid}:\n" foreach grep { ! getgrgid($_->{gid}) } @$users; foreach my $u (@$users) { if (! -d "$p$u->{home}") { -- cgit v1.2.1