From 49c870d2f3409b2bda262e4ff8a9be550b8d0292 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Tue, 5 Oct 2010 11:44:54 +0200
Subject: remove /proc/bus/usb stuff..

---
 src/initramfs/scripts/init                 | 2 --
 src/os-plugins/plugins/vmware/XX_vmware.sh | 5 -----
 2 files changed, 7 deletions(-)

(limited to 'src')

diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index ec0e815f..0fc1371f 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -851,7 +851,6 @@ for i in /var/run/utmp /var/log/wtmp /var/log/lastlog /etc/mtab ; do
   echo -n > /mnt/$i
 done
 chown 65534:0 /mnt/var/lib/nobody
-# /proc/bus/usb might be deprecated in newer kernels ...
 echo -e "# /etc/fstab - file generated by $0 (initramfs from $date)\n#\
 \tOpenSLX Project, info@openslx.com\n\nrootfs\t\t/\t\trootfs\t\tro\t\t 0 0\n\
 proc\t\t/proc\t\tproc\t\tdefaults\t 0 0\ninitramdevs\t/dev\t\ttmpfs\
@@ -993,7 +992,6 @@ sed -n "s,/mnt,,;/\/tmp /p" /proc/mounts >> /mnt/etc/mtab
 [ -f /tmp/fstab ] && cat /tmp/fstab >> /mnt/etc/fstab
 # preparations to leave initramfs - umounting ...
 umount -n /sys || error "$init_errsys" nonfatal
-umount -n /proc/bus/usb >/dev/null 2>&1
 chmod 1777 /dev/shm /mnt/tmp 2>/dev/null
 
 runinithook '95-cleanup'
diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh
index 26b49cc5..edbd5003 100644
--- a/src/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/src/os-plugins/plugins/vmware/XX_vmware.sh
@@ -153,11 +153,6 @@ ${vmware_imagesrc}." nonfatal
     done
     chmod 0700 /dev/vmnet*
 
-    echo -e "usbfs\t\t/proc/bus/usb\tusbfs\t\tauto\t\t 0 0" >> /mnt/etc/fstab
-    # needed for VMware 5.5.4 and versions below
-    echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \
-      >>/mnt/etc/init.d/boot.slx
-     
     # allow VMware swapping if RamZSWAP is enabled
     if grep -E "^ramzswap.*1 -.*" /proc/modules ; then
       echo -e '.encoding = "UTF-8"\nprefvmx.minVmMemPct = "50"
-- 
cgit v1.2.3-55-g7522