From e4206c86b4b4bec604c52196027136d76bc858b5 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Thu, 27 Mar 2014 22:15:08 +0000
Subject: [PATCH] updatedate routes scripts so that we can route through a
 device

Conflicts:
	xCAT-server/lib/xcat/plugins/route.pm
---
 xCAT-server/lib/xcat/plugins/route.pm | 10 +++++-----
 xCAT/postscripts/routeop              | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/route.pm b/xCAT-server/lib/xcat/plugins/route.pm
index 3acd90217..27967f8d6 100644
--- a/xCAT-server/lib/xcat/plugins/route.pm
+++ b/xCAT-server/lib/xcat/plugins/route.pm
@@ -970,7 +970,7 @@ sub addPersistentRoute_RH {
     if ($net =~ /:/) {
         $filename="/etc/sysconfig/static-routes-ipv6";
     } else {
-        $filename="/etc/sysconfig/static-routes";
+        $filename="/etc/sysconfig/sysconfig/route-$ifname";
     }
     my @output=getConfig($filename);
     #print "old output=" . join("\n", @output) . "\n";
@@ -991,7 +991,7 @@ sub addPersistentRoute_RH {
 
         $new_config="$ifname $net/$mask $gw_ip";
     } else {
-        $new_config="any net $net netmask $mask gw $gw_ip $ifname\n";
+        $new_config="$net/$mask via $gw_ip dev $ifname\n";
     }
     if (!$hasConfiged) {
 	push(@output, $new_config);
@@ -1028,7 +1028,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
         $filename="/etc/sysconfig/static-routes-ipv6";
     } else {
-        $filename="/etc/sysconfig/static-routes";
+        $filename="/etc/sysconfig/network-scripts/route-$ifname";
     }
     my @output=getConfig($filename);
     #print "old output=" . join("\n", @output) . "\n";
@@ -1050,7 +1050,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
         $rsp->{data}->[0]= "$host: Removed persistent route \"$ifname $net/$mask $gw_ip\" from $filename.";
     } else {
-        $rsp->{data}->[0]= "$host: Removed persistent route \"any net $net netmask $mask gw $gw_ip $ifname\" from $filename.";
+        $rsp->{data}->[0]= "$host: Removed persistent route \"$net/$mask via $gw_ip dev $ifname\" from $filename.";
     }
 	$callback->($rsp);
     } else {
@@ -1058,7 +1058,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
 	    $rsp->{data}->[0]= "$host: Persistent route \"$ifname $net/$mask $gw_ip\" does not exist in $filename.";
     } else {
-	    $rsp->{data}->[0]= "$host: Persistent route \"any net $net netmask $mask gw $gw_ip $ifname\" does not exist in $filename.";
+	    $rsp->{data}->[0]= "$host: Persistent route \"$net/$mask via $gw_ip dev $ifname\" does not exist in $filename.";
     }
 	$callback->($rsp);
     }
diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 7260a033a..8fb22fc6f 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -278,9 +278,9 @@ add_persistent_route()
             # $net/mask does not work with sed cmd
             route1="$ifname $net\/$mask $gw";
         else
-            filename="/etc/sysconfig/static-routes";
-            route="any net $net netmask $mask gw $gw $ifname";
-            route1="any net $net netmask $mask gw $gw $ifname";
+            filename="/etc/sysconfig/network-scripts/route-$ifname";
+            route="$net/$mask via $gw dev $ifname";
+            route1="$net\/$mask via $gw dev $ifname";
         fi
         if [ -f $filename ]; then
             grep "$route" $filename 2>&1 1>/dev/null
@@ -400,9 +400,9 @@ rm_persistent_route()
             route="$ifname $net\/$mask $gw"
             route1="$ifname $net/$mask $gw"
         else
-            filename="/etc/sysconfig/static-routes";
-            route="any net $net netmask $mask gw $gw $ifname";
-            route1="any net $net netmask $mask gw $gw $ifname";
+            filename="/etc/sysconfig/network-scripts/route-$ifname";
+            route="$net/$mask via $gw dev $ifname";
+            route1="$net\/$mask via $gw dev $ifname";
         fi
         if [ -f $filename ]; then
             grep "$route" $filename 2>&1 1>/dev/null
@@ -438,7 +438,11 @@ if [ "$op" = "add" ]; then
             fi
         else
             if [ "$(uname -s)" = "Linux" ]; then
-                cmd="route add -net $net netmask $mask gw $gw"
+	        if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
+                  cmd="route add -net $net netmask $mask dev $iface"
+		else	
+                  cmd="route add -net $net netmask $mask gw $gw"
+		fi
             else 
                 cmd="route add -net $net -netmask $mask $gw"
             fi