From 62f89e83c786c4dcb5d099377f8f370b65e23a0a Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 3 Mar 2007 13:33:43 +0000 Subject: [PATCH] Stefan Fiedler: target/livecd: fix configuration of installed fonts NOTE: works if done by hand, not tested in a full build [2007012004411622129] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8226 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/livecd/build_stage2.sh | 7 +++++++ target/livecd/fixedfiles/xorg.conf | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/target/livecd/build_stage2.sh b/target/livecd/build_stage2.sh index 5706645f7..35ec20fcf 100644 --- a/target/livecd/build_stage2.sh +++ b/target/livecd/build_stage2.sh @@ -26,6 +26,13 @@ echo_status "Running ldconfig to create links ..." ldconfig -r . echo_status "Running depmod for target system ..." depmod -b $PWD -F ../boot/System.map `ls ../boot/vmlinuz_* | sed -e 's,\.\./boot/vmlinuz_,,'` +echo_status "Running mkfontscale/mkfontdir and fc-cache ..." +for dir in usr/X11R7/lib/X11/fonts/* ; do + [ -d $dir ] || continue + mkfontscale $dir + mkfontdir $dir + fc-cache -v $dir +done # echo_status "replacing some vital files for live useage ..." cp -f $base/target/$target/fixedfiles/inittab etc/inittab diff --git a/target/livecd/fixedfiles/xorg.conf b/target/livecd/fixedfiles/xorg.conf index 5dc17a5b5..2c0155f8b 100644 --- a/target/livecd/fixedfiles/xorg.conf +++ b/target/livecd/fixedfiles/xorg.conf @@ -80,21 +80,21 @@ Section "DRI" EndSection Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/CID/" - FontPath "/usr/X11R6/lib/X11/fonts/PEX/" - FontPath "/usr/X11R6/lib/X11/fonts/Speedo/" - FontPath "/usr/X11R6/lib/X11/fonts/Type1/" - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/" - FontPath "/usr/X11R6/lib/X11/fonts/encodings/" - FontPath "/usr/X11R6/lib/X11/fonts/freefont/" - FontPath "/usr/X11R6/lib/X11/fonts/latin2/" - FontPath "/usr/X11R6/lib/X11/fonts/local/" - FontPath "/usr/X11R6/lib/X11/fonts/misc/" - FontPath "/usr/X11R6/lib/X11/fonts/sharefont" - FontPath "/usr/X11R6/lib/X11/fonts/TrueType" + RgbPath "/usr/X11R7/share/X11/rgb" + FontPath "/usr/X11R7/lib/X11/fonts/75dpi/:unscaled" + FontPath "/usr/X11R7/lib/X11/fonts/100dpi/:unscaled" + FontPath "/usr/X11R7/lib/X11/fonts/CID/" + FontPath "/usr/X11R7/lib/X11/fonts/PEX/" + FontPath "/usr/X11R7/lib/X11/fonts/Speedo/" + FontPath "/usr/X11R7/lib/X11/fonts/Type1/" + FontPath "/usr/X11R7/lib/X11/fonts/cyrillic/" + FontPath "/usr/X11R7/lib/X11/fonts/encodings/" + FontPath "/usr/X11R7/lib/X11/fonts/freefont/" + FontPath "/usr/X11R7/lib/X11/fonts/latin2/" + FontPath "/usr/X11R7/lib/X11/fonts/local/" + FontPath "/usr/X11R7/lib/X11/fonts/misc/" + FontPath "/usr/X11R7/lib/X11/fonts/sharefont" + FontPath "/usr/X11R7/lib/X11/fonts/TrueType" FontPath "/usr/share/ghostscript/fonts/" EndSection