From 2af90479fbd25ca63d9697200d43ea614d657184 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 03:17:20 +0000 Subject: hotplug-based network script rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2531 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/default/etc/functions.sh | 69 +------- .../base-files/default/etc/hotplug.d/net/01-wds | 5 - .../base-files/default/etc/hotplug.d/net/10-net | 190 +++++++++++++++++++++ package/base-files/default/etc/init.d/S10boot | 21 ++- package/base-files/default/etc/init.d/S40network | 8 +- package/base-files/default/etc/nvram.sh | 4 +- 6 files changed, 211 insertions(+), 86 deletions(-) delete mode 100644 package/base-files/default/etc/hotplug.d/net/01-wds create mode 100644 package/base-files/default/etc/hotplug.d/net/10-net (limited to 'package/base-files/default/etc') diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh index 9cfc80235..e7126473f 100755 --- a/package/base-files/default/etc/functions.sh +++ b/package/base-files/default/etc/functions.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/sh . /etc/nvram.sh alias debug=${DEBUG:-:} @@ -7,74 +7,11 @@ alias debug=${DEBUG:-:} if_valid () ( ifconfig "$1" >&- 2>&- || [ "${1%%[0-9]}" = "br" ] || - { - [ "${1%%[0-9]}" = "vlan" ] && ( - i=${1#vlan} - hwname=$(nvram get vlan${i}hwname) - hwaddr=$(nvram get ${hwname}macaddr) - [ -z "$hwaddr" ] && return 1 - - vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1) - debug "# vlan$i => $vif" - - $DEBUG ifconfig $vif up - $DEBUG vconfig add $vif $i 2>&- - ) - } || { debug "# missing interface '$1' ignored"; false; } ) -do_ifup() { - if_proto=$(nvram get ${2}_proto) - if=$(nvram get ${2}_ifname) - [ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname) - - pidfile=/var/run/${if}.pid - [ -f $pidfile ] && $DEBUG kill $(cat $pidfile) - - case "$1" in - static) - ip=$(nvram get ${2}_ipaddr) - netmask=$(nvram get ${2}_netmask) - gateway=$(nvram get ${2}_gateway) - - $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up - ${gateway:+$DEBUG route add default gw $gateway} - - [ -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) - DHCP_NETMASK=$(nvram get ${2}_netmask) - $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up - - DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile" - DHCP_HOSTNAME=$(nvram get ${2}_hostname) - DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} - [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME" - [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &" - oldpid=$(cat $pidfile) - ${DEBUG:-eval} "udhcpc $DHCP_ARGS" - pidof udhcpc | grep "$oldpid" >&- 2>&- && { - sleep 1 - kill -9 $oldpid - } - # hotplug events are handled by /usr/share/udhcpc/default.script - ;; - none|"") - ;; - *) - [ -x "/sbin/ifup.$1" ] && { $DEBUG /sbin/ifup.$1 ${2}; exit; } - echo "### ifup ${2}: ignored ${2}_proto=\"$1\" (not supported)" - ;; - esac +hotplug_dev() { + env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net } bitcount () { diff --git a/package/base-files/default/etc/hotplug.d/net/01-wds b/package/base-files/default/etc/hotplug.d/net/01-wds deleted file mode 100644 index 38bd69667..000000000 --- a/package/base-files/default/etc/hotplug.d/net/01-wds +++ /dev/null @@ -1,5 +0,0 @@ -[ "${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/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net new file mode 100644 index 000000000..29df1d2ce --- /dev/null +++ b/package/base-files/default/etc/hotplug.d/net/10-net @@ -0,0 +1,190 @@ +#!/bin/sh +setup_eth() +{ + [ -f /proc/net/wl0 ] && { + lsmod | grep wlcompat >&- || insmod wlcompat + } + iwconfig "$INTERFACE" 2>&- | grep -v 'no wireless' >&- && { + /sbin/wifi + } + if="$(echo "$INTERFACE" | sed s,eth,et,)" + ifconfig "$INTERFACE" up 2>&- >&- + for vlan in $(seq 0 15); do + [ "$(nvram get vlan${vlan}hwname)" = "$if" ] && \ + $DEBUG vconfig add "$INTERFACE" "$vlan" + done +} + +find_name() +{ + pppoa_ifname="atm0" # hack for ppp over atm, which has no ${proto}_ifname + interfaces="lan wan wifi $(nvram get ifnames)" + for ifname in $interfaces; do + IFTYPE="${ifname}" + IFPROTO="$(nvram get ${IFTYPE}_proto)" + IFACE="$(nvram get ${IFTYPE}_ifname)" + [ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || { + [ "${IFACE}" = "$INTERFACE" ] && return 0 + case "$IFPROTO" in + static|dhcp) + [ "${IFACE%%[0-9]*}" = "br" ] && { + for part in $(nvram get ${IFTYPE}_ifnames); do + [ "$part" = "$INTERFACE" ] && return 0 + done + } + ;; + *) + [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \ + -a -x /sbin/ifup.${IFPROTO} ] && return 0 + ;; + esac + } + done + IFACE="" + IFTYPE="" + IFPROTO="" + return 255 +} + +do_ifup() { + if="$3" + if_proto="$(nvram get ${2}_proto)" + + pidfile=/var/run/${if}.pid + [ -f $pidfile ] && $DEBUG kill $(cat $pidfile) + + case "$1" in + static) + ip=$(nvram get ${2}_ipaddr) + netmask=$(nvram get ${2}_netmask) + gateway=$(nvram get ${2}_gateway) + + $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up + ${gateway:+$DEBUG route add default gw $gateway} + + [ -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) + DHCP_NETMASK=$(nvram get ${2}_netmask) + $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up + + DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile" + DHCP_HOSTNAME=$(nvram get ${2}_hostname) + DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} + [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME" + [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &" + oldpid=$(cat $pidfile) + ${DEBUG:-eval} "udhcpc $DHCP_ARGS" + pidof udhcpc | grep "$oldpid" >&- 2>&- && { + sleep 1 + kill -9 $oldpid + } + # hotplug events are handled by /usr/share/udhcpc/default.script + ;; + *) + if [ -x "/sbin/ifup.$1" ]; then + ( $DEBUG . /sbin/ifup.$1 ${2} $3 ) + fi + ;; + esac +} + +do_register() +{ + case "${INTERFACE%%[0-9]*}" in + eth) setup_eth;; + esac + + [ -z "$IFTYPE" -o -z "$IFPROTO" ] && { + find_name || { + case "${INTERFACE%%[0-9]*}" in + wds) + for tmp in lan wifi; do + [ -z "$IFPROTO" ] && [ "$(nvram get ${tmp}_ifname)" = "br0" ] && { + IFPROTO="$(nvram get ${tmp}_proto)" + IFTYPE="${tmp}" + } + done + [ -z "$IFPROTO" ] && return 0 + ;; + atm) + for tmp in lan wan wifi $(nvram get ifnames); do + [ "$(nvram get ${tmp}_proto)" = "pppoa" ] && { + do_ifup "pppoa" "$tmp" "$INTERFACE" + return 0 + } + done + ;; + *) + return 0 + ;; + esac + } + } + + case "${INTERFACE%%[0-9]*}" in + ppp|atm);; + *) + mac=$(nvram get ${IFTYPE}_hwaddr) + ${mac:+$DEBUG ifconfig $INTERFACE down hw ether $mac} + ;; + esac + + if="$(nvram get ${IFTYPE}_ifname)" + if [ "${if%%[0-9]}" = "br" ]; then + if_valid "$INTERFACE" && { + ifconfig "$if" 2>&- >&- || { + stp=$(nvram get ${IFTYPE}_stp) + $DEBUG brctl addbr "$if" + $DEBUG brctl setfd "$if" 0 + $DEBUG brctl stp "$if" "${stp:-0}" + } + + if [ "$INTERFACE" != "$if" ]; then + $DEBUG ifconfig "$INTERFACE" 0.0.0.0 up + brctl addif "$if" "$INTERFACE" + else + do_ifup "$IFPROTO" "$IFTYPE" "$if" + fi + } + else + do_ifup "$IFPROTO" "$IFTYPE" "$if" + fi +} + +do_unregister() { + [ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&- + [ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name + [ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0 + + [ "${IFACE%%[0-9]*}" = "br" ] && { + if [ "$INTERFACE" != "$IFACE" ]; then + brctl delif "$IFACE" "$INTERFACE" 2>&- >&- + else + brctl delbr "$IFACE" 2>&- >&- + fi + } + + case "$IFPROTO" in + pppoe|pppoa|pptp) + killall ifup.${IFPROTO} + killall pppd + ;; + dhcp) + [ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&- + ;; + esac +} + +case "$ACTION" in + register) do_register;; + unregister) do_unregister;; +esac diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot index b0dc04eb7..d5ec19436 100755 --- a/package/base-files/default/etc/init.d/S10boot +++ b/package/base-files/default/etc/init.d/S10boot @@ -5,10 +5,22 @@ echo "S" > /proc/jffs2_bbc } +vconfig set_name_type VLAN_PLUS_VID_NO_PAD + +HOSTNAME=$(nvram get wan_hostname) +HOSTNAME=${HOSTNAME%%.*} +echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname + +# automagically run firstboot +[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && { + { mount|grep "on / type jffs2" 1>&-; } || firstboot +} + mkdir -p /var/run mkdir -p /var/log touch /var/log/wtmp touch /var/log/lastlog +[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash @@ -20,13 +32,4 @@ ifconfig eth0 promisc robocfg show } -HOSTNAME=$(nvram get wan_hostname) -HOSTNAME=${HOSTNAME%%.*} -echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname - -vconfig set_name_type VLAN_PLUS_VID_NO_PAD -# automagically run firstboot -[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && { - { mount|grep "on / type jffs2" 1>&-; } || firstboot -} diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network index df7c6b351..168fd2979 100755 --- a/package/base-files/default/etc/init.d/S40network +++ b/package/base-files/default/etc/init.d/S40network @@ -3,10 +3,10 @@ [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network case "$1" in start|restart) - ifup lan - ifup wan - ifup wifi - wifi up +# ifup lan +# ifup wan +# ifup wifi +# wifi up for route in $(nvram get static_route); do { eval "set $(echo $route | sed 's/:/ /g')" diff --git a/package/base-files/default/etc/nvram.sh b/package/base-files/default/etc/nvram.sh index f1170ac47..4d39a1020 100644 --- a/package/base-files/default/etc/nvram.sh +++ b/package/base-files/default/etc/nvram.sh @@ -4,8 +4,8 @@ nvram () { if [ -x /usr/sbin/nvram ]; then case $1 in - get) eval "echo \${$2:-\$(command nvram get $2)}";; - *) command nvram $*;; + get) eval "echo \${$2:-\$(/usr/sbin/nvram get $2)}";; + *) /usr/sbin/nvram $*;; esac else case $1 in -- cgit v1.2.3