allow move to be launched in testing mode

3 files changed, 11 insertions, 5 deletions

diff --git a/move/move.pm b/move/move.pm
index 8ec1ea96e..b9c3be542 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -17,6 +17,9 @@ my @ALLOWED_LANGS = qw(en_US fr es it de);
 #- by stage1 of course)
 sub init {
     my ($o) = @_;
+
+    $::testing and goto drakx_stuff;
+
     #- rw things
     mkdir "/$_" foreach qw(home mnt root etc var);
     mkdir_p "/var/$_" foreach qw(log run/console spool lib/xkb lock/subsys);
@@ -46,6 +49,7 @@ sub init {
 
     modules::load_category('multimedia/sound');
 
+drakx_stuff:
     $o->{steps}{startMove} = { reachable => 1, text => "Start Move" };
     $o->{orderedSteps_orig} = $o->{orderedSteps};
     $o->{orderedSteps} = [ qw(selectLanguage acceptLicense selectMouse selectKeyboard startMove) ];
diff --git a/move/runstage2 b/move/runstage2
index 64c557db6..f5bff628b 100755
--- a/move/runstage2
+++ b/move/runstage2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use lib qw(/usr/bin/stage2 /usr/lib/libDrakX);
+use lib qw(../perl-install /usr/bin/stage2 /usr/lib/libDrakX);
 use install2;
 
 $::isStandalone = 0;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 8d4fb6ebc..419d29894 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -41,7 +41,7 @@ sub new($$) {
 	}
 	my $launchX = sub {
 	    my ($server, $Driver) = @_;
-            $::move and goto launch_X;
+            $::move and goto configured_X;
 
 	    my $xpmac_opts = cat_('/proc/cmdline');
 	    install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver);
@@ -51,14 +51,16 @@ sub new($$) {
 	    my @options = (
 	      if_(arch() !~ /^sparc/ && arch() ne 'ppc' && $server ne 'Xnest', 
 		  '-kb', '-allowMouseOpenFail', '-xf86config', $f),
-	      ($wanted_DISPLAY, 'tty7', '-dpms', '-s', '240'),
+	      ('tty7', '-dpms', '-s', '240'),
 	    );
 
 	    push @options, $xpmac_opts !~ /ofonly/ ? ('-mode', '17', '-depth', '32') : '-mach64' if $server =~ /Xpmac/;
 	    push @options, '-fp', '/usr/X11R6/lib/X11/fonts:unscaled' if $server =~ /Xsun|Xpmac/;
+
+          configured_X:
 	    push @options, '-ac', '-geometry', $o->{vga16} ? '640x480' : '800x600' if $server eq 'Xnest';
+            push @options, $wanted_DISPLAY;
 
-          launch_X:
 	    if (!fork()) {
 		c::setsid();
 		exec $server, @options or c::_exit(1);
@@ -103,7 +105,7 @@ sub new($$) {
 	    @servers = qw(Xpmac);
         }
 
-        if ($::move) {
+        if ($::move && !$::testing) {
             require move;
             require run_program;
             move::automatic_xconf($o);