diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-02-29 23:50:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-02-29 23:50:14 +0000 |
| commit | 4d37bebbb47db98088c70d4d4395ca29cef35f8a (patch) | |
| tree | 996d38b7735fa03a79be75615dbe6692916d0094 /perl-install/install_steps.pm | |
| parent | 6de7bc2092b2c1c7c3bae2b4a7d0c8b59ce5e1d3 (diff) | |
| download | drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.gz drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.bz2 drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.xz drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 38b21a60f..1d277745a 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -19,6 +19,7 @@ use log; use fsedit; use commands; use network; +use any; use fs; my @filesToSaveForUpgrade = qw( @@ -418,7 +419,7 @@ sub installCrypto { my $u = $o->{crypto} or return; $u->{mirror} or return; my ($packages, %done); my $dir = "$o->{prefix}/tmp"; - modules::write_conf("$o->{prefix}/etc/conf.modules", 'append'); + modules::write_conf("$o->{prefix}/etc/conf.modules"); network::up_it($o->{prefix}, $o->{intf}) if $o->{intf}; local *install_any::getFile = sub { @@ -550,7 +551,7 @@ sub addUser($) { } eval { commands::chown_("-r", "$u->{uid}.$u->{gid}", "$p$u->{home}") } if $u->{uid} != $u->{oldu} || $u->{gid} != $u->{oldg}; - + any::addKdmIcon($p, $u->{name}, $u->{icon}); } require any; any::addUsers($o->{prefix}, map { $_->{name} } @l); @@ -715,6 +716,7 @@ sub miscellaneous { my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system"); $o->{miscellaneous}{HDPARM} ||= $s{HDPARM} if exists $s{HDPARM}; + $o->{miscellaneous}{CLEAN_TMP} ||= $s{HDPARM} if exists $s{CLEAN_TMP}; $o->{security} ||= $s{SECURITY} if exists $s{SECURITY}; $ENV{SECURE_LEVEL} = $o->{security}; |