From e807651fae0bc29cc6c343d4f119bd12db074f46 Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Fri, 27 Jul 2018 14:29:23 -0700
Subject: [PATCH 1/2] routeop: inconditionally replace the default gateway

---
 xCAT/postscripts/routeop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 66c58808f..db022ca08 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -300,7 +300,7 @@ replace_persistent_route()
             if [ "$net" = "default" ]; then
                 filename="/etc/sysconfig/network"
                 route="GATEWAY=$gw"
-                routedest="$route"
+                routedest="GATEWAY="
             fi
             if [ -f $filename ]; then
                 egrep "^$routedest" $filename 2>&1 1>/dev/null

From ad07e33014914258f21ce1fadec2c353bb40810a Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Fri, 27 Jul 2018 14:47:06 -0700
Subject: [PATCH 2/2] routeop: add missing definitions for $route{,dest}1 which
 are missing for the default route case.

Also, properly isolate bash variables from regexp in sed command.
---
 xCAT/postscripts/routeop | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index db022ca08..ee31126ce 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -258,7 +258,7 @@ replace_persistent_route()
                     echo "Persistent route \"$route\" has been added in $filename."
                 else 
                     # replace it
-                    sed -i -e "s/$routedest1.*/$route1/g" $filename
+                    sed -i -e "s/${routedest1}.*/$route1/g" $filename
                     echo "Persistent route \"$route\" has been replaced in $filename."
                 fi
             else
@@ -300,7 +300,9 @@ replace_persistent_route()
             if [ "$net" = "default" ]; then
                 filename="/etc/sysconfig/network"
                 route="GATEWAY=$gw"
+                route1=$route
                 routedest="GATEWAY="
+                routedest1=$routedest
             fi
             if [ -f $filename ]; then
                 egrep "^$routedest" $filename 2>&1 1>/dev/null
@@ -309,7 +311,7 @@ replace_persistent_route()
                     echo "Persistent route \"$route\" has been added in $filename."
                 else 
                     # replace it
-                    sed -i -e "s/$routedest1.*/$route1/g" $filename
+                    sed -i -e "s/${routedest1}.*/$route1/g" $filename
                     echo "Persistent route \"$route\" has been replaced in $filename."
                 fi
             else