diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-08-05 04:23:39 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-08-05 04:23:39 +0000 |
| commit | 89a14b9204e0caad6d143949e0ea9c4cf2173df9 (patch) | |
| tree | 519b1c93edb0466e653010a6b5faa993c93c86cb /perl-install/Xconfig | |
| parent | 6d1a9d2a8eb719e5ff0e3ea3517b3e59075f306c (diff) | |
| download | drakx-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar drakx-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.gz drakx-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.bz2 drakx-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.xz drakx-89a14b9204e0caad6d143949e0ea9c4cf2173df9.zip | |
move is_xbox from common to detect_devices
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/monitor.pm | 2 | ||||
| -rw-r--r-- | perl-install/Xconfig/resolution_and_depth.pm | 4 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfree.pm | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm index 20eae5966..4c592e783 100644 --- a/perl-install/Xconfig/monitor.pm +++ b/perl-install/Xconfig/monitor.pm @@ -11,7 +11,7 @@ use log; sub good_default_monitor() { - is_xbox() ? 'Generic|640x480 @ 60 Hz' : + detect_devices::is_xbox() ? 'Generic|640x480 @ 60 Hz' : arch() =~ /ppc/ ? (detect_devices::get_mac_model() =~ /^iBook/ ? 'Apple|iBook 800x600' : 'Apple|iMac/PowerBook 1024x768') : (detect_devices::isLaptop() ? 'Generic|Flat Panel 1024x768' : 'Generic|1024x768 @ 70 Hz'); diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm index b99e62bac..8ae9bab7f 100644 --- a/perl-install/Xconfig/resolution_and_depth.pm +++ b/perl-install/Xconfig/resolution_and_depth.pm @@ -42,10 +42,10 @@ sub bios_vga_modes() { @bios_vga_modes } sub size2default_resolution { my ($size) = @_; #- size in inch + require detect_devices; if (arch() =~ /ppc/) { - require detect_devices; return "1024x768" if detect_devices::get_mac_model() =~ /^PowerBook|^iMac/; - } elsif (is_xbox()) { + } elsif (detect_devices::is_xbox()) { return "640x480"; } diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm index f9b6eaa54..e47748615 100644 --- a/perl-install/Xconfig/xfree.pm +++ b/perl-install/Xconfig/xfree.pm @@ -692,7 +692,8 @@ Section "ServerFlags" AllowMouseOpenFail # allows the server to start up even if the mouse does not work END -$default_header .= <<'END_XBOX' if is_xbox(); +require detect_devices; +$default_header .= <<'END_XBOX' if detect_devices::is_xbox(); Option "PciProbe1" "false" Option "PciProbe2" "false" Option "PciForceConfig1" "false" |