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) = @_;