From 80ef1045fa3c98278d880868c461f5ca9604f9ba Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Tue, 2 Sep 2008 14:29:24 +0000 Subject: * moved 8.04 modifications to default * removed exclude variable from default git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2185 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/distro-specs/ubuntu/functions-8.04 | 10 +--------- initramfs/distro-specs/ubuntu/functions-default | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'initramfs/distro-specs') diff --git a/initramfs/distro-specs/ubuntu/functions-8.04 b/initramfs/distro-specs/ubuntu/functions-8.04 index 1c00d9d8..c50f9d41 100644 --- a/initramfs/distro-specs/ubuntu/functions-8.04 +++ b/initramfs/distro-specs/ubuntu/functions-8.04 @@ -14,12 +14,4 @@ # initial ramfs - stage3) It may overwrite settings from the default config # file (/etc/functions) -config_udev () { - if [ -f /mnt/etc/init.d/udev ] ; then - rllinker "udev" 7 14 - fi - if [ -f /mnt/etc/init.d/udev-finish ] ; then - rllinker "udev-finish" 24 2 - fi -} - +# no changes from default diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 7d08b32c..fbe9f3c6 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -21,9 +21,9 @@ # D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on # TempFS usage # D_DIRINDXS - directories in client filesystem which should be present anyhow -D_ETCEXCL="etc/gconf/*\n*.old\n*-\netc/autoinstall\nlogrotate*\nbootloader\n\ -*~\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ -X11/xdm/pixmaps\ndhclient.script" +#D_ETCEXCL="etc/gconf/*\n*.old\n*-\netc/autoinstall\nlogrotate*\nbootloader\n\ +#*~\npptp.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 \ @@ -118,6 +118,16 @@ sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale # group of functions for the normal runlevels - first parameter is start # second stop +# configure udev +config_udev () { + if [ -f /mnt/etc/init.d/udev ] ; then + rllinker "udev" 7 14 + fi + if [ -f /mnt/etc/init.d/udev-finish ] ; then + rllinker "udev-finish" 24 2 + fi +} + # function for ntp configuration config_ntp () { if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then -- cgit v1.2.3-55-g7522