summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
commit0f16f9693f47687136e5058916d0d04dcb611217 (patch)
tree621a0c76850737d6353385ece3f3fda54219f7b0 /perl-install/install_steps.pm
parent83e615434cf1bc3a692ab95b9b8aac3af6c366c8 (diff)
downloaddrakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.gz
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.bz2
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.tar.xz
drakx-backup-do-not-use-0f16f9693f47687136e5058916d0d04dcb611217.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm47
1 files changed, 24 insertions, 23 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bbe35e2f7..8bcc53898 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -102,7 +102,7 @@ sub selectPath {}
sub selectInstallClass($@) {
my ($o) = @_;
$o->{installClass} ||= "normal";
- $o->{security} || ${{
+ $o->{security} ||= ${{
normal => 2,
developer => 3,
server => 4,
@@ -205,7 +205,6 @@ sub installPackages($$) {
}
push @toInstall, grep { $_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages;
push @toInstall, grep { !$_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages;
- print int @toInstall, "<<<<<<\n";
pkgs::install($o->{prefix}, \@toInstall);
}
@@ -237,6 +236,26 @@ sub configureNetwork($) {
install_any::pkg_install($o, "dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp|bootp)$/ } @{$o->{intf}};
#-res_init(); #- reinit the resolver so DNS changes take affect
+
+ pppConfig($o);
+}
+
+#------------------------------------------------------------------------------
+sub pppConfig {
+ my ($o) = @_;
+ $o->{modem} or return;
+
+ symlinkf($o->{modem}{device}, "$o->{prefix}/dev/modem");
+ install_any::pkg_install($o, "ppp");
+
+ my %toreplace;
+ $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain);
+ $toreplace{phone} =~ s/[^\d]//g;
+ $toreplace{dnsserver} = join '', map { "$o->{modem}{$_}," } "dns1", "dns2";
+
+ foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") {
+ template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config";
+ }
}
#------------------------------------------------------------------------------
@@ -255,24 +274,6 @@ sub pcmciaConfig($) {
}
#------------------------------------------------------------------------------
-sub modemConfig {
- my ($o) = @_;
- symlinkf($o->{modem}{device}, "$o->{prefix}/dev/modem") if $o->{modem};
-}
-
-sub pppConfig {
- my ($o) = @_;
- my %toreplace;
-
- $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain);
- $toreplace{phone} =~ s/[^\d]//g;
- $toreplace{dnsserver} = ($o->{modem}{dns1} && "$o->{modem}{dns1},") . ($o->{modem}{dns2} && "$o->{modem}{dns2},");
- foreach ("$o->{prefix}/root", "$o->{prefix}/etc/skel") {
- template2file("/usr/share/kppprc.in", "$_/.kde/share/config/kppprc", %toreplace) if -d "$_/.kde/share/config";
- }
-}
-
-#------------------------------------------------------------------------------
sub timeConfig {
my ($o, $f) = @_;
timezone::write($o->{prefix}, $o->{timezone}, $f);
@@ -336,9 +337,9 @@ sub addUser($) {
if (!$g || getgrgid($g)) { for ($g = 500; getgrgid($g) || $gids{$g}; $g++) {} }
$_->{home} ||= "/home/$_->{name}";
- $_->{uid} = $u;
- $_->{gid} = $g;
- $_{pw} ||= $_->{password} && install_any::crypt($_->{password});
+ $_->{uid} = $u; $uids{$u} = 1;
+ $_->{gid} = $g; $gids{$g} = 1;
+ $_->{pw} ||= $_->{password} && install_any::crypt($_->{password});
$done{$_->{name}} = 1;
}
} @{$o->{users} || []};