summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
commit31de738c99ce16ee26595d7bf2d6e9500a5a10b1 (patch)
tree30cb27258fcac641440869517e35e28f29177eb1 /perl-install/install_steps.pm
parentf093421759947c0e1020139c8b0bdb057105c074 (diff)
downloaddrakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.gz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.bz2
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.xz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dfae6ebc1..8df7f94b5 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -859,7 +859,7 @@ sub setupXfree {
require class_discard;
{ local $::testing = 0; #- unset testing
local $::auto = 1;
- local $::skiptest = 1;
+ $o->{X}{skiptest} = 1;
Xconfigurator::main($o->{prefix}, $o->{X}, class_discard->new, $o->{allowFB}, bool($o->{pcmcia}), sub {
$o->pkg_install("XFree86-$_[0]");
});
@@ -927,6 +927,9 @@ sub generateAutoInstFloppy($) {
}
#------------------------------------------------------------------------------
+sub exitInstall { install_any::unlockCdrom }
+
+#------------------------------------------------------------------------------
sub hasNetwork {
my ($o) = @_;