diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-11-18 01:52:09 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-11-18 01:52:09 +0000 |
| commit | 2d6f40c73b6ec610c43f7073bd2e12b0790387e2 (patch) | |
| tree | 531cc78c0d37a19e67af10483cc6014ab9bb8fc8 /perl-install/install2.pm | |
| parent | 38dea3d2412ecdbe2988f58b7ce7a905aff5fb10 (diff) | |
| download | drakx-backup-do-not-use-2d6f40c73b6ec610c43f7073bd2e12b0790387e2.tar drakx-backup-do-not-use-2d6f40c73b6ec610c43f7073bd2e12b0790387e2.tar.gz drakx-backup-do-not-use-2d6f40c73b6ec610c43f7073bd2e12b0790387e2.tar.bz2 drakx-backup-do-not-use-2d6f40c73b6ec610c43f7073bd2e12b0790387e2.tar.xz drakx-backup-do-not-use-2d6f40c73b6ec610c43f7073bd2e12b0790387e2.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 1f2d8f1b1..980277321 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -138,9 +138,10 @@ $o = $::o = { #- { mntpoint => "/usr", size => 400 << 11, type => 0x83, growable => 1 }, #- ], shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ], - authentification => { md5 => 1, shadow => 1 }, + authentication => { md5 => 1, shadow => 1 }, lang => 'en', isUpgrade => 0, +#- simple_themes => 1, #- installClass => "normal", timezone => { @@ -520,7 +521,6 @@ sub main { #- make sure we don't pick up any gunk from the outside world $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin" unless $::g_auto_install; - $ENV{LD_LIBRARY_PATH} = ""; if ($o->{interactive} eq "gtk" && availableMemory < 24 * 1024) { log::l("switching to newt install cuz not enough memory"); @@ -545,10 +545,6 @@ sub main { $o->{prefix} = $::testing ? "/tmp/test-perl-install" : "/mnt"; mkdir $o->{prefix}, 0755; - #- make sure we don't pick up any gunk from the outside world - $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin"; - $ENV{LD_LIBRARY_PATH} = ""; - #- needed very early for install_steps_gtk eval { $o->{mouse} ||= mouse::detect() }; |