diff options
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 9 |
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 |