On 05/05/14 at 03:12pm, 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
For the latter format ADDRESS0, I guess the '0' means the order number of nic.
But if it's renamed to anything else which is not ending with number how to
find the right card?
So how about use one uniform format like "192.168.200.222 via 192.168.100.222 dev eth0"?
Maybe always get the route item by 'ip' command instead of reading the route file?
Using ip command there's another possible advantage that no need to handle ipv6 specific
formats in route file if there's any different.
>
> In this patch, port the static route hanling from ifup-routes of initscript
> component.
>
> v1->v2:
> Remove the commentary line checking code and "MATCH" pattern
> definition since dracut require posix syntax. Let's focus on the
> functionality of static route.
>
> Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> ---
> modules.d/40network/net-lib.sh | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
> index a82f1a8..0d488b5 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
> +
Suppose it's for static setup only, how about moving the code into do_static
in ifup.sh
> # 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,35 @@ find_iface_with_link() {
> return 1
> }
>
> +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
> +
> + while read line; do
> + /sbin/ip $proto $type add $line
> + done < $file
> +}
> +
> is_persistent_ethernet_name() {
> case "$1" in
> # udev persistent interface names
> --
> 1.9.0
>
> --
> 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
--
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
