summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-18 16:48:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-18 16:48:06 +0000
commit8d3e07a6988c9d46122ee6548a1b153048ffeb20 (patch)
tree2e93bbc9a9f6cc946cac65e5e1ac2bb47561b483
parentc1951071cefd503e95bed05365f34333deaca7d2 (diff)
downloaddrakx-backup-do-not-use-8d3e07a6988c9d46122ee6548a1b153048ffeb20.tar
drakx-backup-do-not-use-8d3e07a6988c9d46122ee6548a1b153048ffeb20.tar.gz
drakx-backup-do-not-use-8d3e07a6988c9d46122ee6548a1b153048ffeb20.tar.bz2
drakx-backup-do-not-use-8d3e07a6988c9d46122ee6548a1b153048ffeb20.tar.xz
drakx-backup-do-not-use-8d3e07a6988c9d46122ee6548a1b153048ffeb20.zip
- set $::prefix
- drop $o->{root} (was "/tmp/root-perl-install" when testing but completly unused)
-rw-r--r--perl-install/install2.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 1659cd644..69afd5dff 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -433,11 +433,9 @@ sub main {
log::openLog(($::testing || $o->{localInstall}) && 'debug.log');
log::l("second stage install running (", any::drakx_version(), ")");
- $o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt";
- $o->{root} = $::testing ? "/tmp/root-perl-install" : "/";
+ $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt";
$o->{isUpgrade} = 1 if $::live;
mkdir $o->{prefix}, 0755;
- mkdir $o->{root}, 0755;
devices::make("/dev/zero"); #- needed by ddcxinfos
#- make sure we don't pick up any gunk from the outside world