summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-03 14:15:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-03 14:15:56 +0000
commitaeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6 (patch)
treed58b6d13b9c516b3050507f2ead4a8e6e1b855ca /perl-install
parentfc77648a83616932f76760fbcd903182bfdbf1ff (diff)
downloaddrakx-aeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6.tar
drakx-aeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6.tar.gz
drakx-aeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6.tar.bz2
drakx-aeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6.tar.xz
drakx-aeaff5c49670fbc9cec1ba397e4a04b2dd9c92b6.zip
(main): move the setting of PATH and spawnShell *after* setting $prefix
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index fc07b9693..829828e6e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -546,12 +546,6 @@ 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";
$o->{root} = $::testing ? "/tmp/root-perl-install" : "/";
if ($::live) {
@@ -561,6 +555,12 @@ 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;
+
+ eval { spawnShell() };
+
$o->{interactive} ||= 'gtk';
if ($o->{interactive} eq "gtk" && availableMemory < 22 * 1024) {
log::l("switching to newt install cuz not enough memory");