summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-04-01 22:15:47 +0200
committerDirk von Suchodoletz2009-04-01 22:15:47 +0200
commit06484510d591a32056f2b480cbfc825d771fcbd3 (patch)
treeb37cd634b1ec385a89a8264c7d5753e4baa3d36b
parentvmchooser plugin: (diff)
downloadcore-06484510d591a32056f2b480cbfc825d771fcbd3.tar.gz
core-06484510d591a32056f2b480cbfc825d771fcbd3.tar.xz
core-06484510d591a32056f2b480cbfc825d771fcbd3.zip
Udev trigger for Ubuntu ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2783 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default1
-rwxr-xr-xinitramfs/stage3-stuff/bin/hwautocfg4
2 files changed, 3 insertions, 2 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index fd14dbd0..d4048fd0 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -77,6 +77,7 @@ config_distro () {
# clean up the udev script as much is handled already in stage3
sed -e "3i# Script modified during SLX stage3 bootup (config_distro)" \
+ -e "/# This next bit can/a\ /sbin/udevadm trigger" \
-e "/# We need the uevent/,/# It's all over/d" \
-e "/# Log things that/,/kill \$UDEV/d" -i /mnt/etc/init.d/udev
}
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index 22f00561..4dbf96e7 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -150,8 +150,8 @@ finish () {
mdev -s
# remove unneeded disk and mouse drivers
[ ! -s /etc/hwinfo.disk ] && rmmod sd_mod 2>/dev/null
-grep -q -i "PS/2" /etc/hwinfo.mouse || \
- { rmmod psmouse 2>/dev/null; rm /dev/psaux 2>/dev/null; }
+#grep -q " PS/2 " /etc/hwinfo.mouse || \
+# { rmmod psmouse 2>/dev/null; rm /dev/psaux 2>/dev/null; }
# more sophistication possible :)
# remove /sbin/mdev as not available in stage4
echo >/proc/sys/kernel/hotplug