[patch] change DO_USB to DO_usb

linuxrc.patch (text/plain), 2.27 KB, created by postmodern on 2005-10-06 20:54:09 UTC

--- linuxrc.orig	2005-10-06 19:31:22.000000000 -0700
+++ linuxrc	2005-10-06 20:57:14.000000000 -0700
@@ -79,6 +79,15 @@
 	  CDROOT=1
 	  CDROOT_DEV=`parse_opt "${x}"`
 	  ;;
+      usbroot)
+          CDROOT=1
+          USBROOT=1
+	  ;;
+      usbroot\=*)
+          CDROOT=1
+          USBROOT=1
+	  USBROOT_DEV=`parse_opt "${x}"`
+	  ;;
 
       # Start livecd loop and looptype options
       loop\=*)
@@ -220,6 +229,8 @@
     good_msg 'Skipping module load; no modules in the initrd!'
 fi
 
+if [ "${DO_usb}" != '0' ] && mount -t usbfs usbfs /proc/bus/usb
+
 # Mount sysfs
 mount_sysfs
 
@@ -608,6 +619,7 @@
 
 	if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
 	then
+		[ "${DO_usb}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!'
 		umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
 		mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!'
 		rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
@@ -619,10 +631,12 @@
 		/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr
 		/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core 
 		umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!'
+		[ "${DO_usb}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!'
 		umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
 		umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!'
 	elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ]
 	then
+		[ "${DO_usb}" != '0' ] && umount /tmp/.initrd/proc/bus/usb || echo "*: Failed to unmount the initrd /proc/bus/usb!"
 		umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!"
 		umount /dev 2>/dev/null
 		mount -n --move /tmp/.initrd/dev dev 2>/dev/null
@@ -654,6 +668,7 @@
        echo -n '.'
                umount /dev || echo '*: Failed to unmount the initrd /dev!'
                umount /sys || echo '*: Failed to unmount the initrd /sys!'
+               [ "${DO_usb}" != '0' ] && umount /proc/bus/usb || echo '*: Failed to unmount the initrd /proc/bus/usb!'
                umount /proc || echo '*: Failed to unmount the initrd /proc!'
        echo -n '.'