CC Marc On 04/28/14 at 05:41pm, Baoquan He wrote: > User may specify static route for a target address which is different > than default gateway. The static route file could be like below: > > 192.168.200.222 via 192.168.100.222 dev eth0 > > Or > > ADDRESS0=192.168.200.0 > NETMASK0=255.255.255.0 > GATEWAY0=192.168.100.222 > > In this patch, port the static route hanling from ifup-routes of initscript > component. > > Signed-off-by: Baoquan He <bhe@xxxxxxxxxx> > --- > modules.d/40network/net-lib.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh > index d53e1a6..a9c647a 100755 > --- a/modules.d/40network/net-lib.sh > +++ b/modules.d/40network/net-lib.sh > @@ -103,6 +103,16 @@ setup_net() { > [ -e /tmp/net.$netif.resolv.conf ] && \ > cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf > > + #add static route if exist > + f="/etc/route-$netif" > + if [ -e "$f" ]; then > + if grep -Eq '^[[:space:]]*ADDRESS[0-9]+=' $f ; then > + handle_file $f $netif > + else > + handle_ip_file $f > + fi > + fi > + > # Handle STP Timeout: arping the default gateway. > # (or the root server, if a) it's local or b) there's no gateway.) > # Note: This assumes that if no router is present the > @@ -517,6 +527,38 @@ find_iface_with_link() { > return 1 > } > > +MATCH='^[[:space:]]*(\#.*)?$' > + > +handle_file () { > + . $1 > + routenum=0 > + while [ "x$(eval echo '$'ADDRESS$routenum)x" != "xx" ]; do > + eval $(ipcalc -p $(eval echo '$'ADDRESS$routenum) $(eval echo '$'NETMASK$routenum)) > + line="$(eval echo '$'ADDRESS$routenum)/$PREFIX" > + if [ "x$(eval echo '$'GATEWAY$routenum)x" != "xx" ]; then > + line="$line via $(eval echo '$'GATEWAY$routenum)" > + fi > + line="$line dev $2" > + /sbin/ip route add $line > + routenum=$(($routenum+1)) > + done > +} > + > +handle_ip_file() { > + local f t type= file=$1 proto="-4" > + f=${file##*/} > + t=${f%%-*} > + type=${t%%6} > + if [ "$type" != "$t" ]; then > + proto="-6" > + fi > + { cat "$file" ; echo ; } | while read line; do > + if [[ ! "$line" =~ $MATCH ]]; then > + /sbin/ip $proto $type add $line > + fi > + done > +} > + > is_persistent_ethernet_name() { > case "$1" in > # udev persistent interface names > -- > 1.8.5.3 > -- To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html