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

5 files changed, 15 insertions, 17 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
 }
diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf
index d5790be2..bb80527b 100644
--- a/installer/default_files/dhcpd.conf
+++ b/installer/default_files/dhcpd.conf
@@ -4,13 +4,6 @@
 #####                                                         #####
 ###################################################################
 
-option o128 code 128              = string;
-option o129 code 129              = string;
-option menudflts code 160         = string;
-option motdline1 code 184         = string;
-option menuline1 code 192         = string;
-option menuline2 code 193         = string;
-option menuline3 code 194         = string;
 option bootlocal-script code 221  = string;
 option language code 222          = string;
 option start-x code 223           = string;
@@ -83,7 +76,6 @@ next-server			   @@@server@@@;
 # type of displaymanager to use (it should be installed
 # correctly on the server: XDMCP must be enabled then!)
 
-option o128                        E4:45:74:68:00:00;
 #deny                               unknown-clients;
 allow				   bootp;
 #allow				   booting;
diff --git a/installer/distro-specs/exclude-suse-10.0 b/installer/distro-specs/exclude-suse-10.0
index a92cbde5..7e11c820 100644
--- a/installer/distro-specs/exclude-suse-10.0
+++ b/installer/distro-specs/exclude-suse-10.0
@@ -20,6 +20,7 @@
 - /usr/share/vmware/*
 - *lost+found*
 - /media/*
+- /usr/X11R6/bin/BackGround
 - /opt/kde3/share/autostart/SUSEgreeter.desktop
 - /opt/kde3/share/autostart/suseplugger.desktop
 - /opt/kde3/share/autostart/susewatcher.desktop
diff --git a/installer/distro-specs/exclude-suse-10.1 b/installer/distro-specs/exclude-suse-10.1
index eba6441e..3b4a0c0b 100644
--- a/installer/distro-specs/exclude-suse-10.1
+++ b/installer/distro-specs/exclude-suse-10.1
@@ -21,6 +21,7 @@
 - /usr/share/vmware/*
 - *lost+found*
 - /media/*
+- /usr/X11R6/bin/BackGround
 - /opt/kde3/share/autostart/SUSEgreeter.desktop
 - /opt/kde3/share/autostart/suseplugger.desktop
 - /opt/kde3/share/autostart/profile_chooser-autostart.desktop
diff --git a/installer/distro-specs/exclude-suse-9.3 b/installer/distro-specs/exclude-suse-9.3
index 76ec157c..9d89b5df 100644
--- a/installer/distro-specs/exclude-suse-9.3
+++ b/installer/distro-specs/exclude-suse-9.3
@@ -20,6 +20,7 @@
 - /usr/share/vmware/*
 - *lost+found*
 - /media/*
+- /usr/X11R6/bin/BackGround
 - /opt/kde3/share/autostart/SUSEgreeter.desktop
 - /opt/kde3/share/autostart/suseplugger.desktop
 - /opt/kde3/share/autostart/susewatcher.desktop