From 0e7227973071c798328403d9dc77995efbd84e57 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 31 Jul 2007 16:05:25 +0000
Subject: The /var/cache/fontconfig directory should be present on Debian and
 Ubuntu systems (newer ones) to avoid the recreation of fontcache on startup
 (of gdm etc.)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1286 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/debian/config-4.0     | 3 ++-
 initramfs/distro-specs/debian/config-default | 2 +-
 initramfs/distro-specs/ubuntu/config-7.04    | 9 ++++++---
 initramfs/distro-specs/ubuntu/config-default | 6 ++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/debian/config-4.0 b/initramfs/distro-specs/debian/config-4.0
index 01730eb0..69011342 100644
--- a/initramfs/distro-specs/debian/config-4.0
+++ b/initramfs/distro-specs/debian/config-4.0
@@ -28,4 +28,5 @@
 # D_HWMODTOIGNORE - hardware modules which should not tried to load (because
 # already in kernel, nonexistent, ...)
 
-# nothing changed (yet) compared to the config-default file
+D_RODIRSINRW="etc/gconf etc/X11/xkb /var/cache/fontconfig /var/lib/texmf \
+/var/lib/dpkg"
diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index d1daa173..a2ffe2fd 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -37,7 +37,7 @@ pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script"
 D_BINDMPTS="tmp root home"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm /etc/X11"
-D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf"
+D_RODIRSINRW="etc/gconf etc/X11/xkb /var/lib/texmf /var/lib/dpkg"
 D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
 /var/lib/pam_devperm /var/lib/bluetooth \
diff --git a/initramfs/distro-specs/ubuntu/config-7.04 b/initramfs/distro-specs/ubuntu/config-7.04
index 6aaa7453..9b4174d4 100644
--- a/initramfs/distro-specs/ubuntu/config-7.04
+++ b/initramfs/distro-specs/ubuntu/config-7.04
@@ -36,8 +36,11 @@
 
 # Aus 6.10:
 # mountvirtfs does not exist anymore -> use mountkernfs.sh
-D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh bootlogd hwclock.sh sudo console-setup"
-D_ETCEXCL="*.old\n*-\n\
-etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
+D_ETCEXCL="*.old\n*-\n etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script"
+D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
+/var/lib/pango /var/lib/defoma /var/cache/fontconfig"
+D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh \
+bootlogd hwclock.sh sudo console-setup"
+
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index cb1a74bc..08980d46 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -24,7 +24,8 @@
 # D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
 # D_BINDMNT - any code which is specific in bind mount environment
-# D_BINDMPTS - These directories will be created in the ramdisk and movemounted to the root ("/") this will also happen to /var and /etc
+# D_BINDMPTS - These directories will be created in the ramdisk and movemounted
+# to the root ("/") this will also happen to /var and /etc
 # D_RCDIRS - runlevel directories relative to /etc
 # D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
@@ -43,7 +44,8 @@ pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script"
 D_BINDMPTS="tmp root home media"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
-D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell /var/lib/pango /var/lib/defoma"
+D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
+/var/lib/pango /var/lib/defoma"
 #D_RWDIRSINRO="/var/lib/gdm"
 D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
-- 
cgit v1.2.3-55-g7522