Fix autoinstalls to work around a modern d-i bug

[invirt/packages/invirt-xen-config.git] / vif-invirtroute

diff --git a/vif-invirtroute b/vif-invirtroute
index d1c5216..b3d9207 100755 (executable)
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -13,11 +13,11 @@
 # vif-route (add|remove|online|offline)
 #
 # Environment vars:
 # vif-route (add|remove|online|offline)
 #
 # Environment vars:

-# vif         vif interface name (required).
+# vif    vif interface name (required).

 # XENBUS_PATH path to this device's details in the XenStore (required).
 # Read from the store:
 # XENBUS_PATH path to this device's details in the XenStore (required).
 # Read from the store:

-# ip      list of IP networks for the vif, space-separated (default given in
-#         this script).
+# ip     list of IP networks for the vif, space-separated (default given in
+#        this script).

 #
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
 #
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu

@@ -31,21 +31,23 @@ dev=${dev:-${vif}}
 
 case "$command" in
     online|add)
 
 case "$command" in
     online|add)

-        ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up
-        echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp
+       ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up
+       echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp

        echo 1 >/proc/sys/net/ipv4/conf/${dev}/rp_filter 
        xenstore-write "$XENBUS_PATH/feature-gso-tcpv4" 0
        echo 1 >/proc/sys/net/ipv4/conf/${dev}/rp_filter 
        xenstore-write "$XENBUS_PATH/feature-gso-tcpv4" 0

-        if [ x${qemu_online} != xyes ]; then
-          ethtool -K ${dev} tx off
-        fi
-        ipcmd='add'
-        cmdprefix=''
-        ;;
+       if [ x${qemu_online} != xyes ]; then
+         ethtool -K ${dev} tx off
+       fi
+       ipcmd='add'
+       ipt_action='-A'
+       cmdprefix=''
+       ;;

     offline|remove)
     offline|remove)

-        do_without_error ifdown ${vif}
-        ipcmd='del'
-        cmdprefix='do_without_error'
-        ;;
+       do_without_error ifdown ${vif}
+       ipcmd='del'
+       ipt_action='-D'
+       cmdprefix='do_without_error'
+       ;;

 esac
 
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
 esac
 
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")

@@ -74,9 +76,10 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
            # 2) In the case of a non-pv-aware guest, the tap route
            # (with metric 1) should take precedence over the vif
            # route and carry all the traffic.
            # 2) In the case of a non-pv-aware guest, the tap route
            # (with metric 1) should take precedence over the vif
            # route and carry all the traffic.

-                

 
 

+           src=""

            if [ $ipcmd == "add" ]; then
            if [ $ipcmd == "add" ]; then

+               src="src ${main_ip}"

                case $dev in
                    vif*)
                        metric="metric 2"
                case $dev in
                    vif*)
                        metric="metric 2"

@@ -86,15 +89,22 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
                        ;;
                esac
            fi
                        ;;
                esac
            fi

-           ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip} $metric
+           ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} ${src} $metric

            case "$command" in
                online|add)
            case "$command" in
                online|add)

-                   arpspoof -i $(invirt-getconf xen.iface) -t 18.181.0.1 ${addr}&
-                   sleep 5
-                   kill %arpspoof
+                   timeout -s KILL 5 arpspoof -i $(invirt-getconf xen.iface) -t ${gateway} ${addr} || :

                    ;;
            esac
        done 
                    ;;
            esac
        done 

+       if [ -n "$other_ip" ]; then
+           ${cmdprefix} ip route ${ipcmd} ${other_ip} dev ${dev} ${src} $metric
+           iptables -t nat ${ipt_action} PREROUTING -d ${other_ip} -j DNAT --to-destination ${addr}
+           case "$command" in
+               online|add)
+                   timeout -s KILL 5 arpspoof -i $(invirt-getconf xen.iface) -t ${other_gateway} ${other_ip} || :
+                   ;;
+           esac
+       fi

     fi
 fi
 
     fi
 fi