From 949ab0f0941e3266d8ab79380399dfe6a0020aea Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 24 Nov 1999 20:19:00 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dbeccd122..540e06014 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -301,9 +301,7 @@ sub pppConfig {
     print F "nameserver $o->{modem}{dns2}\n" if $o->{modem}{dns2};
     close F;
 
-    foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") {
-	template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config";
-    }
+    install_any::template2userfile($o->{prefix}, "/usr/share/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace);
 
     miscellaneousNetwork($o);
 }
@@ -383,7 +381,7 @@ sub addUser($) {
 	} else {
 	    my $u = $_->{uid} || ($_->{oldu} = (stat("$p$_->{home}"))[4]);
 	    my $g = $_->{gid} || ($_->{oldg} = (stat("$p$_->{home}"))[5]);
-	    #- search for available uid above 501 else initscripts may fail to change llanguage for KDE.
+	    #- 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++) {} }
 
@@ -401,7 +399,7 @@ sub addUser($) {
     print F join(':', @$_{@etc_pass_fields}), "\n" foreach @l;
 
     open F, ">> $p/etc/group" or die "can't append to group file: $!";
-    print F "$_->{name}::$_->{gid}:\n" foreach @l;
+    print F "$_->{name}:x:$_->{gid}:\n" foreach @l;
 
     foreach (@l) {
 	if (! -d "$p$_->{home}") {
-- 
cgit v1.2.1