From 7b8a53966aaa3fd75af370c9bd8d4c4009a5c6e3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 20 Oct 2011 15:01:06 +0000 Subject: base-files: move network related scripts to a separate package to make the transition to netifd easier git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28495 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/etc/hotplug.d/iface/00-netstate | 5 - .../base-files/files/etc/hotplug.d/iface/10-routes | 137 --------------------- package/base-files/files/etc/hotplug.d/net/10-net | 72 ----------- 3 files changed, 214 deletions(-) delete mode 100644 package/base-files/files/etc/hotplug.d/iface/00-netstate delete mode 100644 package/base-files/files/etc/hotplug.d/iface/10-routes delete mode 100644 package/base-files/files/etc/hotplug.d/net/10-net (limited to 'package/base-files/files/etc/hotplug.d') diff --git a/package/base-files/files/etc/hotplug.d/iface/00-netstate b/package/base-files/files/etc/hotplug.d/iface/00-netstate deleted file mode 100644 index 37b1e934eb..0000000000 --- a/package/base-files/files/etc/hotplug.d/iface/00-netstate +++ /dev/null @@ -1,5 +0,0 @@ -[ ifup = "$ACTION" ] && { - uci_toggle_state network "$INTERFACE" up 1 - uci_toggle_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime) - [ -n "$DEVICE" ] && uci_toggle_state network "$INTERFACE" ifname "$DEVICE" -} diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes deleted file mode 100644 index d57a5b3c78..0000000000 --- a/package/base-files/files/etc/hotplug.d/iface/10-routes +++ /dev/null @@ -1,137 +0,0 @@ -add_route() { - local config="$1" - - # is this route intended for the - # $INTERFACE of this hotplug event - config_get interface "$config" interface - [ "$interface" != "$INTERFACE" ] && return 0 - - # get the real interface name from network config - config_get dev "$interface" ifname - - config_get target "$config" target - config_get netmask "$config" netmask - config_get gateway "$config" gateway - config_get metric "$config" metric - config_get mtu "$config" mtu - - # make sure there is a gateway and a target - [ -n "$target" ] || { - echo "Missing target in route section $config" - return 1 - } - [ -n "$gateway" ] || { - config_get gateway "$interface" gateway - } - - # handle "0.0.0.0" as "no gateway given" to allow - # defining gateway-less routes while still keeping - # the possibility to have static routes with a - # proper gateway on interfaces with dynamic ips - [ "$gateway" = "0.0.0.0" ] && gateway="" - - dest="${netmask:+-net "$target" netmask "$netmask"}" - dest="${dest:--host "$target"}" - - /sbin/route add $dest ${gateway:+gw "$gateway"} \ - ${dev:+dev "$dev"} ${metric:+ metric "$metric"} \ - ${mtu:+mss "$mtu"} -} - -add_route6() { - local config="$1" - - # is this route intended for the - # $INTERFACE of this hotplug event - config_get interface "$config" interface - [ "$interface" != "$INTERFACE" ] && return 0 - - # get the real interface name from network config - config_get dev "$interface" ifname - - config_get target "$config" target - config_get gateway "$config" gateway - config_get metric "$config" metric - config_get mtu "$config" mtu - - # make sure there is a gateway and a target - [ -n "$target" ] || { - echo "Missing target in route section $config" - return 1 - } - [ -n "$gateway" ] || { - config_get gateway "$interface" gateway - } - - /sbin/route -A inet6 add $target ${gateway:+gw "$gateway"} \ - ${dev:+dev "$dev"} ${metric:+ metric "$metric"} \ - ${mtu:+mss "$mtu"} -} - -# Skip fake devices (e.g. relayd) -grep -qs "^ *$DEVICE:" /proc/net/dev || exit 0 - -case "$ACTION" in - ifup) - include /lib/network - scan_interfaces - - # Setup aliases - config_set "$INTERFACE" aliases "" - config_set "$INTERFACE" alias_count 0 - config_foreach setup_interface_alias alias "$INTERFACE" "$DEVICE" - - # Save alias references in state vars - local aliases - config_get aliases "$INTERFACE" aliases - [ -z "$aliases" ] || uci_toggle_state network "$INTERFACE" aliases "$aliases" - - # Make ip6addr of parent iface the main address again - local ip6addr - config_get ip6addr "$INTERFACE" ip6addr - [ -z "$ip6addr" ] || { - ifconfig "$DEVICE" del "$ip6addr" - ifconfig "$DEVICE" add "$ip6addr" - } - - # Setup sysctls - local proto accept_ra send_rs - - config_get proto "$INTERFACE" proto - if [ "$proto" = dhcp ]; then - accept_ra=1 - send_rs=0 - else - accept_ra=0 - send_rs=1 - fi - - config_get_bool accept_ra "$INTERFACE" accept_ra $accept_ra - [ $accept_ra -eq 0 ] || { - logger -t ifup "Allowing Router Advertisements on $INTERFACE ($DEVICE)" - accept_ra=2 - } - do_sysctl "net.ipv6.conf.$DEVICE.accept_ra" $accept_ra - - config_get_bool send_rs "$INTERFACE" send_rs $send_rs - [ $send_rs -eq 0 ] || { - logger -t ifup "Enabling Router Solicitations on $INTERFACE ($DEVICE)" - send_rs=2 - } - do_sysctl "net.ipv6.conf.$DEVICE.forwarding" $send_rs - - - # Setup routes - config_foreach "add_route" route - config_foreach "add_route6" route6 - ;; - ifdown) - # Bring down named aliases - local device=$(uci_get_state network "$INTERFACE" device) - local ifn - for ifn in $(ifconfig | sed -ne "s/^\(\($DEVICE${device:+\|$device}\|br-$INTERFACE\):[^[:space:]]\+\).*/\1/p"); do - ifconfig "$ifn" down - done - ;; -esac - diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net deleted file mode 100644 index 013ece39ce..0000000000 --- a/package/base-files/files/etc/hotplug.d/net/10-net +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -include /lib/network - -addif() { - # Ensure that ipv6 is loaded, autoloading happens later but ipv6 might be - # required now for interface setup. - [ -d /proc/sys/net/ipv6 ] || { - grep -q '^ipv6' /etc/modules.d/* && insmod ipv6 - } - - # PPP devices are configured by pppd, no need to run setup_interface here - case "$INTERFACE" in - 3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) return 0;; - esac - - scan_interfaces - local cfg="$(find_config "$INTERFACE")" - - case "$INTERFACE" in - # Skip wireless parent interfaces - ath[0-9]|wlan[0-9]) ;; - *) - # check the autoload setting - config_get auto "$cfg" auto - case "$auto" in - 1|on|enabled) setup_interface "$INTERFACE";; - esac - ;; - esac - - # find all vlan configurations for this interface and set them up as well - for ifc in $interfaces; do - config_get iftype "$ifc" type - config_get ifs "$ifc" device - for dev in $ifs; do - [ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && { - add_vlan "$dev" - } - done - done -} - - -delif() { - scan_interfaces - - # find all vlan configurations for this interface and nuke 'em - for ifc in $interfaces; do - config_get iftype "$ifc" type - config_get ifs "$ifc" device - confdevs="$(uci_get network.$ifc.ifname)" - for dev in $ifs; do - [ "${dev%%\.*}" = "$INTERFACE" ] && { - list_contains confdevs "$dev" || list_remove ifs "$dev" - } - done - uci_set_state "network" "$ifc" device "$ifs" - done -} - -case "$ACTION" in - add|register) - case "$PHYSDEVDRIVER" in - natsemi) sleep 1;; - esac - addif - ;; - remove|unregister) - delif - ;; -esac -- cgit v1.2.3