diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-11-28 19:14:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-11-28 19:14:45 +0000 |
| commit | 2ee22881483e84ea8b5ef0a5125631c04d174617 (patch) | |
| tree | 049f83e2f8ef8c2ed3630d26b8a9f9c525202709 /perl-install/Xconfigurator.pm | |
| parent | 68db145d16c5fa22c876b294411cb9417ad3b08e (diff) | |
| download | drakx-backup-do-not-use-2ee22881483e84ea8b5ef0a5125631c04d174617.tar drakx-backup-do-not-use-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.gz drakx-backup-do-not-use-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.bz2 drakx-backup-do-not-use-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.xz drakx-backup-do-not-use-2ee22881483e84ea8b5ef0a5125631c04d174617.zip | |
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 7e9bdb8b6..626ccd7bb 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -263,8 +263,8 @@ sub testConfig($) { ($resolutions, $clocklines); } -sub testFinalConfig($;$) { - my ($o, $auto) = @_; +sub testFinalConfig($;$$) { + my ($o, $auto, $skiptest) = @_; $o->{monitor}{hsyncrange} && $o->{monitor}{vsyncrange} or $in->ask_warn('', _("Monitor not configured")), return; @@ -279,7 +279,7 @@ sub testFinalConfig($;$) { write_XF86Config($o, $::testing ? $tmpconfig : "$prefix/etc/X11/XF86Config"); - $o->{card}{server} eq 'FBDev' and return 1; #- avoid testing since untestable without reboot. + $skiptest || $o->{card}{server} eq 'FBDev' and return 1; #- avoid testing since untestable without reboot. $auto or $in->ask_yesorno(_("Test configuration"), _("Do you want to test the configuration?"), 1) @@ -750,7 +750,7 @@ sub main { } my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto); - $ok &&= testFinalConfig($o, $::auto) unless $::skiptest; + $ok &&= testFinalConfig($o, $::auto, $::skiptest); my $quit; until ($ok || $quit) { |