integration of vmware module. hw modules to ignore for loading ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@126 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 25 insertions, 5 deletions

diff --git a/initrd/distro-specs/debian/config-3.1 b/initrd/distro-specs/debian/config-3.1
index a4d2f48d..7c935fb5 100644
--- a/initrd/distro-specs/debian/config-3.1
+++ b/initrd/distro-specs/debian/config-3.1
@@ -1,6 +1,6 @@
 # Description:  distro specific settings for Debian/Sarge
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006
 #               Blablub
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
@@ -21,6 +21,8 @@
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
 # D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
 # D_DEFAULTCOUNTRY - localization (see common functions)
+# D_HWMODTOIGNORE - hardware modules which should not tried to load (because
+# already in kernel, nonexistent, ...)
 
 D_SYSCONFDIR=/default
 D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\
diff --git a/initrd/distro-specs/gentoo/config-2005.1 b/initrd/distro-specs/gentoo/config-2005.1
index 77716408..5a544e30 100644
--- a/initrd/distro-specs/gentoo/config-2005.1
+++ b/initrd/distro-specs/gentoo/config-2005.1
@@ -1,6 +1,6 @@
 # Description:  distro specific settings for Gentoo
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 21-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006
 #
 # Copyright:    (c) 2005,6 - RZ Universitaet Freiburg
 
@@ -16,6 +16,10 @@
 # anyhow
 # D_BINDMNT - any code which is specific in bind mount environment
 # D_RCDIRS - runlevel directories relative to /etc
+# D_HWMODTOIGNORE - hardware modules which should not tried to load (because
+# already in kernel, nonexistent, ...)
+
+
 D_SYSCONFDIR=conf.d
 D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
diff --git a/initrd/distro-specs/suse/config-9.3 b/initrd/distro-specs/suse/config-9.3
index 4dc89eb0..fc6d6a07 100644
--- a/initrd/distro-specs/suse/config-9.3
+++ b/initrd/distro-specs/suse/config-9.3
@@ -2,7 +2,7 @@
 #		is the base for following SuSE versions until the changes
 #		within them require a major change
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
@@ -23,6 +23,8 @@
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
 # D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
 # D_DEFAULTCOUNTRY - localization (see common functions)
+# D_HWMODTOIGNORE - hardware modules which should not tried to load (because
+# already in kernel, nonexistent, ...)
 
 D_SYSCONFDIR=/sysconfig
 D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n*.rpmorig\n*.rpmnew\n\
@@ -47,4 +49,4 @@ D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.cloc
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
-
+D_HWMODTOIGNORE="i8xx_tco ichxrom"
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 0072fd27..6bf69f2c 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -4,7 +4,7 @@
 #		functions file). This file is the main base for the 
 #		following SuSE distributions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006
 #		Blabla
 #		Blub
 #
@@ -445,6 +445,16 @@ echo -e "\trc_status -v\n\t;;\nesac\nrc_exit" \
 chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
 rllinker "vmware-prep" "18" "02"
 rllinker "vmware" "20" "02"
+# if running start scripts in parallel vmware-prep is not recognized
+# first solution: just avoid running in parallel
+#sed 's/PARALLEL=.*/PARALLEL=no/' /mnt/etc/${D_SYSCONFDIR}/boot \
+#  > /tmp/boot
+#cp /tmp/boot /mnt/etc/${D_SYSCONFDIR}/boot
+# second solution: vmware-prep script should be added to .depends.start
+sed -e "s,TARGETS =,TARGETS = vmware-prep," \
+  /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
+  echo "vmware-prep: " >> /etc/.depend.start
+  cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start
 }
 
 # initialize boot.ld - skript to be executed during early system startup
diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10
index 7ec484b0..d81ce635 100644
--- a/initrd/distro-specs/ubuntu/config-5.10
+++ b/initrd/distro-specs/ubuntu/config-5.10
@@ -21,6 +21,8 @@
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
 # D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
 # D_DEFAULTCOUNTRY - localization (see common functions)
+# D_HWMODTOIGNORE - hardware modules which should not tried to load (because
+# already in kernel, nonexistent, ...)
 
 D_SYSCONFDIR=/default
 D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\