diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-06 07:20:10 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-06 07:20:10 +0000 |
| commit | 2020825c6dc23ff765f1d1d57725e7d0b1b389f3 (patch) | |
| tree | 755f395369690f62b8f3597197d449a762f94417 /lib/Xconfig/xfree.pm | |
| parent | 074b406fb8474a3967299025ed9b0b8a4316f469 (diff) | |
| download | drakx-kbd-mouse-x11-2020825c6dc23ff765f1d1d57725e7d0b1b389f3.tar drakx-kbd-mouse-x11-2020825c6dc23ff765f1d1d57725e7d0b1b389f3.tar.gz drakx-kbd-mouse-x11-2020825c6dc23ff765f1d1d57725e7d0b1b389f3.tar.bz2 drakx-kbd-mouse-x11-2020825c6dc23ff765f1d1d57725e7d0b1b389f3.tar.xz drakx-kbd-mouse-x11-2020825c6dc23ff765f1d1d57725e7d0b1b389f3.zip | |
- fix default_headers when XFS is installed
(ie fixtitypo)
(and do we really want to configure for XFS even if it is not enabled?)
Diffstat (limited to 'lib/Xconfig/xfree.pm')
| -rw-r--r-- | lib/Xconfig/xfree.pm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index c1e57d0..d9b96b1 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -812,19 +812,6 @@ Section "ServerFlags" AllowMouseOpenFail # allows the server to start up even if the mouse does not work END -if (-x '/usr/bin/xfs') { - warn "Configuring X11\n"; - $default_header .= <<'END'; -Section "Files" - # font server independent of the X server to render fonts. - FontPath "unix/:-1" - # minimal fonts to allow X to run without xfs - FontPath "/usr/share/fonts/misc:unscaled" -EndSection -END -} - - require detect_devices; $default_header .= <<'END_XBOX' if detect_devices::is_xbox(); Option "PciProbe1" "false" @@ -838,6 +825,18 @@ $default_header .= <<'END'; EndSection END +if (-x '/usr/bin/xfs') { + log::l("configuring X font server (XFS)"); + $default_header .= <<'END'; +Section "Files" + # font server independent of the X server to render fonts. + FontPath "unix/:-1" + # minimal fonts to allow X to run without xfs + FontPath "/usr/share/fonts/misc:unscaled" +EndSection +END +} + our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; # Apple iMac modes ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync |