From 0819a334d76a6401c847064c40d692a55cf4fe85 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 7 Sep 2007 09:52:53 +0000 Subject: revert titi commit which added XFS configuration again. AFAIK, there is no reason to need XFS. as for http://archives.mandrivalinux.com/cooker/2007-07/msg04653.php, it's simply the result of a badly configured X fontpath. We just have to ensure upgrades go smoothly. (nb: XFdrake do not *remove* existing XFS configuration from xorg.conf, it simply to not put one when starting from scratch) --- lib/Xconfig/xfree.pm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib/Xconfig/xfree.pm') diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index d9b96b1..5c3f5bc 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -825,18 +825,6 @@ $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 -- cgit v1.2.1