summaryrefslogtreecommitdiffstats
path: root/initrd
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-04-29 12:59:18 +0200
committerDirk von Suchodoletz2006-04-29 12:59:18 +0200
commit2f8b379f79098471d070b512dd5be0c127b45c3e (patch)
tree6fe41cb858a7968071c60dcdf221c95d5723b419 /initrd
parentBug at kernel choice fixed (diff)
downloadcore-2f8b379f79098471d070b512dd5be0c127b45c3e.tar.gz
core-2f8b379f79098471d070b512dd5be0c127b45c3e.tar.xz
core-2f8b379f79098471d070b512dd5be0c127b45c3e.zip
fix for USB/VMware issue, removing unneeded dhcp user specified
variables git-svn-id: http://svn.openslx.org/svn/openslx/ld4@203 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rw-r--r--initrd/distro-specs/suse/functions-10.021
1 files changed, 12 insertions, 9 deletions
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index 6e30b9de..45e0613c 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -3,13 +3,13 @@
# changes should be done there, version specific changes for
# the 10.0 here.
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 28-04-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-04-2006
# Blabla
# Blub
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
#
-# Version: 0.2.1d
+# Version: 0.2.1e
#
postinit () {
@@ -94,16 +94,19 @@ sed -e "s,TARGETS =,TARGETS = vmware-prep," \
cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start
# during vmware sessions linux should not handle usb events/devices
testmkd /mnt/var/X11R6/bin
-echo -e "#!/bin/sh\n# Script for blocking linux from handling usb \
+echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
+echo -e "# Script for blocking linux from handling usb \
devices\n# during vmware sessions. If you like to remove certain modules \
add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
-RET=1\nps aux |grep -i vmware| grep -v \"grep\" &>/dev/null && {\n \
-RET=0\n rmmod usb-storage & >/dev/null\n}\nexit \$RET\n}" > \
- /mnt/var/X11R6/bin/vm-udev
+STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
+/sbin/rmmod usb-storage &>/tmp/null; }\n\
+[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+&>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
chmod u+x /mnt/var/X11R6/bin/vm-udev
echo -e "# special entry to block linux from reacting to usb events during \
running\n# vmware sessions, generated by $0 during initramfs\n# Dirk von \
-Suchodoletz, <dirk@goe.net>\nBUS==\"usb\", ACTION==\"add\", \
-PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"" \
- > /mnt/etc/udev/rules.d/01-udev-vm.rules
+Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
+PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
+SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
+ >> /mnt/etc/udev/rules.d/01-udev-vm.rules
}