summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-19 18:16:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-19 18:16:20 +0000
commit731ea17193335d28308bf00404c37440bb9668ab (patch)
treef897ff1fc42a187a2ea92c390195dedf51522a0d
parent7a5e877904301592a608a2f1d8e05826c10afb30 (diff)
downloaddrakx-731ea17193335d28308bf00404c37440bb9668ab.tar
drakx-731ea17193335d28308bf00404c37440bb9668ab.tar.gz
drakx-731ea17193335d28308bf00404c37440bb9668ab.tar.bz2
drakx-731ea17193335d28308bf00404c37440bb9668ab.tar.xz
drakx-731ea17193335d28308bf00404c37440bb9668ab.zip
set PATH before doing spawnShell
-rw-r--r--perl-install/install2.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0a257ee9d..974bfb531 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -543,6 +543,10 @@ sub main {
log::l("second stage install running");
log::ld("extra log messages are enabled");
+ #- make sure we don't pick up any gunk from the outside world
+ my $remote_path = "$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin";
+ $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$remote_path" unless $::g_auto_install;
+
eval { spawnShell() };
$o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt";
@@ -554,10 +558,6 @@ sub main {
mkdir $o->{prefix}, 0755;
mkdir $o->{root}, 0755;
- #- make sure we don't pick up any gunk from the outside world
- my $remote_path = "$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin";
- $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$remote_path" unless $::g_auto_install;
-
$o->{interactive} ||= 'gtk';
if ($o->{interactive} eq "gtk" && availableMemory < 22 * 1024) {
log::l("switching to newt install cuz not enough memory");