diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-05 17:08:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-05 17:08:16 +0000 |
| commit | d2306af52acf4cce830a0998e897a72ac8e2f414 (patch) | |
| tree | a04ae770c7ae5c45a6ee146fb74e49ef2adfd120 /perl-install/Xconfigurator.pm | |
| parent | 14fc74c9c6a02f370cb6be8ffe2e711940fc2285 (diff) | |
| download | drakx-backup-do-not-use-d2306af52acf4cce830a0998e897a72ac8e2f414.tar drakx-backup-do-not-use-d2306af52acf4cce830a0998e897a72ac8e2f414.tar.gz drakx-backup-do-not-use-d2306af52acf4cce830a0998e897a72ac8e2f414.tar.bz2 drakx-backup-do-not-use-d2306af52acf4cce830a0998e897a72ac8e2f414.tar.xz drakx-backup-do-not-use-d2306af52acf4cce830a0998e897a72ac8e2f414.zip | |
(xtest): use external xtest if standalone
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index ca95fc335..18e9a0e23 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -19,6 +19,13 @@ my $tmpconfig = "/tmp/Xconfig"; my ($prefix, %monitors, %standard_monitors_); +sub xtest { + my ($display) = @_; + $::isStandalone ? + system("DISPLAY=$display /usr/X11R6/bin/xtest") == 0 : + c::Xtest($display); +} + sub getVGAMode($) { $_[0]->{card}{vga_mode} || $vgamodes{"640x480x16"}; } sub readCardsDB { @@ -479,11 +486,11 @@ sub testFinalConfig { ":9" or c::_exit(0); } - do { sleep 1 } until c::Xtest(":9") || waitpid($pid, c::WNOHANG()); + do { sleep 1 } until xtest(":9") || waitpid($pid, c::WNOHANG()); my $b = before_leaving { unlink $f_err }; - unless (c::Xtest(":9")) { + unless (xtest(":9")) { local $_; local *F; open F, $f_err; i: while (<F>) { |