summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-13 08:34:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-13 08:34:50 +0000
commite79950d93af06b735b86548120dc60b2c5be6ee0 (patch)
treecd0d96ad02a9febbbf7b00071c84d89adf81fdc0 /perl-install/install2.pm
parent29a2a329574efc2b945de3d9f2dc08803c6dafd9 (diff)
downloaddrakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar
drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.gz
drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.bz2
drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.xz
drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.zip
instead of keeping stage1 (mostly as temporary space but with a fixed size, and for the background init),
exit the stage1 giving hand to stage2 in a tmpfs (same as what was done for Mandrakemove)
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c1a47d33d..814f38546 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -370,7 +370,11 @@ sub main {
$opt = '';
}
} $cmdline{$opt} = 1 if $opt;
-
+
+ #- from stage1
+ put_in_hash(\%ENV, { getVarsFromSh('/tmp/env') });
+ exists $ENV{$_} and $cmdline{lc($_)} = $ENV{$_} foreach qw(METHOD PCMCIA KICKSTART);
+
map_each {
my ($n, $v) = @_;
my $f = ${{
@@ -438,6 +442,9 @@ sub main {
move::init($o);
}
+ #- free up stage1 memory
+ eval { fs::umount($_) } foreach qw(/stage1/proc/bus/usb /stage1/proc /stage1);
+
$o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::move ? "" : "/mnt";
mkdir $o->{prefix}, 0755;
devices::make("/dev/zero"); #- needed by ddcxinfos