summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--lib/Xconfig/xfree.pm12
2 files changed, 2 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index f4ab10c..50c84bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
-- fix default_headers when XFS is installed
+- do not configure XFS, it's useless
+- fix default_headers (ie allow XFdrake to create xorg.conf from scratch again)
- keep the order from MonitorsDB file
(allows "Flat Panel 800x600" to be before "Flat Panel 1024x768")
(needs a nicely sorted MonitorsDB though)
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