diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-08-21 12:55:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-08-21 12:55:33 +0000 |
| commit | 362609cd2379f2c049595e08229143796ec940f7 (patch) | |
| tree | 586c373acddcb41407df938df0c80af461296185 | |
| parent | 954f4ded244a1dbeaefdf52cbe39b2c00db599c0 (diff) | |
| download | drakx-kbd-mouse-x11-362609cd2379f2c049595e08229143796ec940f7.tar drakx-kbd-mouse-x11-362609cd2379f2c049595e08229143796ec940f7.tar.gz drakx-kbd-mouse-x11-362609cd2379f2c049595e08229143796ec940f7.tar.bz2 drakx-kbd-mouse-x11-362609cd2379f2c049595e08229143796ec940f7.tar.xz drakx-kbd-mouse-x11-362609cd2379f2c049595e08229143796ec940f7.zip | |
do configure XFS if installed
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/Xconfig/xfree.pm | 13 |
2 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,4 @@ +- do configure XFS if installed - when removing/replacing an InputDevice section, ensure we remove the corresponding entry in ServerLayout. ie do not rely on InputDevice sections to use XFdrake-compatible Identifiers (as suggested by fcrozat) diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index 5c3f5bc..c1e57d0 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -812,6 +812,19 @@ 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" |