From 93affffe9250a2fd4311e04a53255537e62ca45c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 3 Aug 2007 17:08:26 +0000
Subject: since we don't configure X to use xfs, we don't need to specify a
 safety fontpath (was useful when xfs was failing)

---
 lib/Xconfig/main.pm  | 4 +---
 lib/Xconfig/xfree.pm | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index a33ad56..6b871ec 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -237,9 +237,7 @@ sub check_valid {
     my %sections = map { 
 	my @l = $raw_X->get_Sections($_) or return "missing section $_";
 	$_ => \@l;
-    } qw(Files InputDevice Monitor Device Screen ServerLayout);
-
-    $sections{Files}[0]{FontPath} or return "missing FontPath";
+    } qw(InputDevice Monitor Device Screen ServerLayout);
 
     '';
 }
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 197c93a..0b84ba4 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -803,11 +803,6 @@ our $default_header = <<'END';
 # this file.
 # **********************************************************************
 
-Section "Files"
-    # minimal fonts to allow X to run without xfs
-    FontPath "/usr/share/fonts/misc:unscaled"
-EndSection
-
 Section "ServerFlags"
     #DontZap # disable <Ctrl><Alt><BS> (server abort)
     #DontZoom # disable <Ctrl><Alt><KP_+>/<KP_-> (resolution switching)
-- 
cgit v1.2.1