From 31de738c99ce16ee26595d7bf2d6e9500a5a10b1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 5 Aug 2000 14:29:16 +0000
Subject: no_comment

---
 perl-install/install_steps.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

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]");
       });
@@ -926,6 +926,9 @@ sub generateAutoInstFloppy($) {
     my ($o) = @_;
 }
 
+#------------------------------------------------------------------------------
+sub exitInstall { install_any::unlockCdrom }
+
 #------------------------------------------------------------------------------
 sub hasNetwork {
     my ($o) = @_;
-- 
cgit v1.2.1