*** empty log message ***

1 files changed, 17 insertions, 18 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2069f01be..93d5347e7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -600,23 +600,6 @@ sub main {
 
     $o->{allowFB} = listlength(cat_("/proc/fb"));
 
-    my $o_;
-    while (1) {
-	require"install_steps_$o->{interactive}.pm";
-    	$o_ = $::auto_install ?
-    	  install_steps_auto_install->new($o) :
-    	    $o->{interactive} eq "stdio" ?
-    	  install_steps_stdio->new($o) :
-    	    $o->{interactive} eq "newt" ?
-    	  install_steps_newt->new($o) :
-    	    $o->{interactive} eq "gtk" ?
-    	  install_steps_gtk->new($o) :
-    	    die "unknown install type";
-	$o_ and last;
-
-	$o->{interactive} = "newt";
-	require install_steps_newt;
-    }
     my $VERSION = cat__(install_any::getFile("VERSION"));
     $o->{lnx4win} = 1 if $VERSION =~ /lnx4win/i;
     $o->{meta_class} = 'desktop' if $VERSION =~ /desktop/i;
@@ -630,13 +613,29 @@ sub main {
 	push @auto, 'selectInstallClass', 'selectMouse', 'doPartitionDisks', 'choosePackages', 'configureTimezone', 'exitInstall';
     }
 
-
     foreach (@auto) {
 	eval "undef *" . (!/::/ && "install_steps_interactive::") . $_;
 	my $s = $o->{steps}{/::(.*)/ ? $1 : $_} or next;
 	$s->{hidden} = 1;
     }
 
+    my $o_;
+    while (1) {
+	require"install_steps_$o->{interactive}.pm";
+    	$o_ = $::auto_install ?
+    	  install_steps_auto_install->new($o) :
+    	    $o->{interactive} eq "stdio" ?
+    	  install_steps_stdio->new($o) :
+    	    $o->{interactive} eq "newt" ?
+    	  install_steps_newt->new($o) :
+    	    $o->{interactive} eq "gtk" ?
+    	  install_steps_gtk->new($o) :
+    	    die "unknown install type";
+	$o_ and last;
+
+	$o->{interactive} = "newt";
+	require install_steps_newt;
+    }
     $::o = $o = $o_;
 
     if (-e "/tmp/network") {