From 7b3e6c7768cdb0e4b095ccc769321e609809787c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 2 Feb 2003 13:51:49 +0000
Subject: - handle {vga16} in Xnest testing mode - fix weird bug due to missing
 aewm-drakx in test mode (??)

---
 perl-install/install_steps_gtk.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index aef7ab91a..169e6804b 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -55,7 +55,7 @@ sub new($$) {
 
 	    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/;
-	    push @options, '-geometry', '800x600' if $server eq 'Xnest';
+	    push @options, '-geometry', $o->{vga16} ? '640x480' : '800x600' if $server eq 'Xnest';
 
 	    unless (fork()) {
 		exec $server, @options or exit 1;
@@ -64,7 +64,7 @@ sub new($$) {
 		sleep 1;
 		log::l("Server died"), return 0 if !$ok;
 		if (c::Xtest($wanted_DISPLAY)) {
-		    fork() || exec("aewm-drakx") || exec("true");
+		    fork() || exec("aewm-drakx") || c::_exit(0);
 		    return 1;
 		}
 	    }
-- 
cgit v1.2.1