add hotplug stuff to trunk/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2364 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 63 insertions, 6 deletions

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index bc9767f49..9cfc80235 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -41,12 +41,14 @@ do_ifup() {
 		$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
 		${gateway:+$DEBUG route add default gw $gateway}
 
-		[ -f /etc/resolv.conf ] && return
-
-		debug "# --- creating /etc/resolv.conf ---"
-		for dns in $(nvram get ${2}_dns); do
-			echo "nameserver $dns" >> /etc/resolv.conf
-		done
+		[ -f /etc/resolv.conf ] || {
+			debug "# --- creating /etc/resolv.conf ---"
+			for dns in $(nvram get ${2}_dns); do
+				echo "nameserver $dns" >> /etc/resolv.conf
+			done
+		}
+		
+		env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
 	;;
 	dhcp)
 		DHCP_IP=$(nvram get ${2}_ipaddr)
@@ -64,6 +66,7 @@ do_ifup() {
 			sleep 1
 			kill -9 $oldpid
 		}
+		# hotplug events are handled by /usr/share/udhcpc/default.script
 	;;
 	none|"")
 	;;
diff --git a/package/base-files/default/etc/hotplug.d/net/01-wds b/package/base-files/default/etc/hotplug.d/net/01-wds
new file mode 100644
index 000000000..38bd69667
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/net/01-wds
@@ -0,0 +1,5 @@
+[ "${INTERFACE%%[0-9]*}" = "wds" ] && { 
+	ifconfig $INTERFACE 0.0.0.0 up
+	/usr/sbin/brctl addif br0 $INTERFACE
+}
+		
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-mount b/package/base-files/default/etc/hotplug.d/usb/01-mount
new file mode 100644
index 000000000..c28ada204
--- /dev/null
+++ b/package/base-files/default/etc/hotplug.d/usb/01-mount
@@ -0,0 +1,49 @@
+mount_storage() {
+	cd /dev/discs
+	for dev in disc*; do
+		[ -f /tmp/.${dev}_id ] || {
+			echo ${INTERFACE}${PRODUCT} > /tmp/.${dev}_id
+			mount | grep /mnt/${dev} || (
+				[ -d /mnt/. ] || {
+					mkdir -p /tmp/mnt
+					ln -s /tmp/mnt /
+				}
+				cd $dev
+				for part in part*; do
+					path=/mnt/${dev}_${part##*part}
+					mkdir -p ${path}
+					mount ${part} ${path}
+				done
+			)
+		}
+	done
+}
+
+umount_storage() {
+	for tmp in /tmp/.*_id; do
+		id=$(cat $tmp 2>&-)
+		[ "${INTERFACE}${PRODUCT}" = "$id" ] && {
+			rm -f $tmp
+			disc=${tmp##*disc}
+			disc=${disc%%_id}
+			for disc in /mnt/disc${disc}*; do
+				umount -f $disc || umount -l $disc
+			done
+		}
+	done
+}
+
+[ -f /proc/bus/usb/devices ] || mount -t usbfs none /proc/bus/usb
+
+case "$ACTION" in
+	add)
+		case "${INTERFACE%%/*}" in
+			8) mount_storage ;;
+		esac
+	;;
+	remove)
+		case "${INTERFACE%%/*}" in
+			8) umount_storage ;;
+		esac
+	;;
+esac