diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-02 13:51:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-02 13:51:49 +0000 |
| commit | 7b3e6c7768cdb0e4b095ccc769321e609809787c (patch) | |
| tree | 75acc5a09e01f9f58c8cce4631c904b604144206 | |
| parent | 101a5dfc666bd6df7943430470dc5130e906ff68 (diff) | |
| download | drakx-backup-do-not-use-7b3e6c7768cdb0e4b095ccc769321e609809787c.tar drakx-backup-do-not-use-7b3e6c7768cdb0e4b095ccc769321e609809787c.tar.gz drakx-backup-do-not-use-7b3e6c7768cdb0e4b095ccc769321e609809787c.tar.bz2 drakx-backup-do-not-use-7b3e6c7768cdb0e4b095ccc769321e609809787c.tar.xz drakx-backup-do-not-use-7b3e6c7768cdb0e4b095ccc769321e609809787c.zip | |
- handle {vga16} in Xnest testing mode
- fix weird bug due to missing aewm-drakx in test mode (??)
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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; } } |