New upstream version 1.12.4 upstream/1.12.4

1 files changed, 9 insertions, 97 deletions

diff --git a/examples/dispatcher/10-ifcfg-rh-routes.sh b/examples/dispatcher/10-ifcfg-rh-routes.sh
index 147506e4..b1d0314d 100755
--- a/examples/dispatcher/10-ifcfg-rh-routes.sh
+++ b/examples/dispatcher/10-ifcfg-rh-routes.sh
@@ -1,49 +1,15 @@
-#!/bin/bash
+#!/bin/sh
+
+# This ifcfg-rh-specific script runs
+# /etc/sysconfig/network-scripts/ifup-routes when bringing up
+# interfaces that have routing rules associated with them that can't
+# be expressed by NMSettingIPConfig. (Eg, policy-based routing.)
 
-# This script applies policy-based routing rules defined for the
-# connection in the /etc/sysconfig/network-scripts/ directory.
-#
 # This should be installed in both dispatcher.d/ and
 # dispatcher.d/pre-up.d/
-#
+
 # pre-up scripts delay activation of the device. To reduce the delay,
 # it is advised to install the script as symlink to no-wait.d directory.
-#
-# This file is derived from scripts 'if{up,down}-routes' from
-# Fedora/RHEL initscripts.
-
-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
-}
-
 
 if [ "$2" != "pre-up" -a "$2" != "down" ]; then
     exit 0
@@ -53,73 +19,19 @@ dir=$(dirname "$CONNECTION_FILENAME")
 if [ "$dir" != "/etc/sysconfig/network-scripts" ]; then
     exit 0
 fi
-
 profile=$(basename "$CONNECTION_FILENAME" | sed -ne 's/^ifcfg-//p')
 if [ -z "$profile" ]; then
     exit 0
 fi
-
 if ! [ -f "$dir/rule-$profile" -o -f "$dir/rule6-$profile" ]; then
     exit 0
 fi
 
 case "$2" in
     pre-up)
-        # Routes
-        FILES="/etc/sysconfig/network-scripts/route-$DEVICE_IP_IFACE"
-        FILES="$FILES /etc/sysconfig/network-scripts/route6-$DEVICE_IP_IFACE"
-        if [ "$profile" != "$DEVICE_IP_IFACE" ]; then
-            FILES="$FILES /etc/sysconfig/network-scripts/route-$profile"
-            FILES="$FILES /etc/sysconfig/network-scripts/route6-$profile"
-        fi
-
-        for file in $FILES; do
-            if [ -f "$file" ]; then
-                if grep -Eq '^[[:space:]]*ADDRESS[0-9]+=' $file ; then
-                    # new format
-                    handle_file $file ${1%:*}
-                else
-                    # older format
-                    handle_ip_file $file
-                fi
-            fi
-        done
-
-        # Rules
-        FILES="/etc/sysconfig/network-scripts/rule-$DEVICE_IP_IFACE"
-        FILES="$FILES /etc/sysconfig/network-scripts/rule6-$DEVICE_IP_IFACE"
-        if [ "$profile" != "$DEVICE_IP_IFACE" ]; then
-            FILES="$FILES /etc/sysconfig/network-scripts/rule-$profile"
-            FILES="$FILES /etc/sysconfig/network-scripts/rule6-$profile"
-        fi
-
-        for file in $FILES; do
-            if [ -f "$file" ]; then
-                handle_ip_file $file
-            fi
-        done
+        /etc/sysconfig/network-scripts/ifup-routes "$DEVICE_IP_IFACE" "$profile"
         ;;
     down)
-        # Routes are deleted by NetworkManager
-        # Rules
-        FILES="/etc/sysconfig/network-scripts/rule-$DEVICE_IP_IFACE"
-        FILES="$FILES /etc/sysconfig/network-scripts/rule6-$DEVICE_IP_IFACE"
-        if [ "$profile" != "$DEVICE_IP_IFACE" ]; then
-            FILES="$FILES /etc/sysconfig/network-scripts/rule-$profile"
-            FILES="$FILES /etc/sysconfig/network-scripts/rule6-$profile"
-        fi
-        for file in $FILES; do
-            if [ -f "$file" ]; then
-                proto=
-                if [ "$file" != "${file##*/rule6-}" ]; then
-                    proto="-6"
-                fi
-                { cat "$file" ; echo ; } | while read line; do
-                    if [[ ! "$line" =~ $MATCH ]]; then
-                        /sbin/ip $proto rule del $line
-                    fi
-                done
-            fi
-        done
+        /etc/sysconfig/network-scripts/ifdown-routes "$DEVICE_IP_IFACE" "$profile"
         ;;
 esac