summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-07-02 09:25:48 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-07-02 09:25:48 +0000
commit755e511024f29df150d9d150d19c849e59c1e216 (patch)
tree008a780c08366ce366c55cc3bbe0d49703f544d6 /perl-install/install2.pm
parente82688c8b8f639705356d25c180ffe754c2b2c34 (diff)
downloaddrakx-755e511024f29df150d9d150d19c849e59c1e216.tar
drakx-755e511024f29df150d9d150d19c849e59c1e216.tar.gz
drakx-755e511024f29df150d9d150d19c849e59c1e216.tar.bz2
drakx-755e511024f29df150d9d150d19c849e59c1e216.tar.xz
drakx-755e511024f29df150d9d150d19c849e59c1e216.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm13
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 295d65a28..611addef3 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -14,7 +14,7 @@ use net;
use keyboard;
use fs;
use fsedit;
-use install_steps;
+use install_steps_graphical;
use install_methods;
use modules;
use partition_table qw(:types);
@@ -154,7 +154,7 @@ sub partitionDisks {
fs::format_part($_) if $_->{mntpoint} && isExt2($_) || isSwap($_);
}
}
- fs::mount_all($o->{fstab}, $o->{prefix});
+ fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
}
sub findInstallFiles {
@@ -165,8 +165,6 @@ sub findInstallFiles {
sub choosePackages { $o->choosePackages($o->{packages}, $o->{comps}); }
sub doInstallStep {
- $testing and return 0;
-
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
$o->afterInstallPackages;
@@ -209,9 +207,10 @@ sub main {
spawnSync();
eval { spawnShell() };
- $o->{prefix} = "/mnt";
+ $o->{prefix} = $testing ? "/tmp/test-perl-install" : "/mnt";
+ mkdir $o->{prefix}, 0755;
$o->{method} = install_methods->new('cdrom');
- $o = install_steps->new($o);
+ $o = install_steps_graphical->new($o);
$o->{lang} = $o->chooseLanguage;
@@ -229,7 +228,7 @@ sub main {
modules::read_conf("/tmp/conf.modules");
# make sure we don't pick up any gunk from the outside world
- $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sbin:/mnt/bin:/mnt/usr/sbin:/mnt/usr/bin";
+ $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin";
$ENV{LD_LIBRARY_PATH} = "";
$o->{keyboard} = eval { keyboard::read("/tmp/keyboard") } || $default->{keyboard};