File 0001-Handle-the-disapperance-of-net-tools.patch of Package python-azure-agent

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Handle-the-disapperance-of-net-tools.patch of Package python-azure-agent (Revision 326a70c46bdb69f8bbc550824b38aab1)

Currently displaying revision 326a70c46bdb69f8bbc550824b38aab1 , Show latest

From 92820176b0e0b580e9c0f4759e0687ed76eadb68 Mon Sep 17 00:00:00 2001
From: Robert Schweikert <rjschwei@suse.com>
Date: Thu, 10 May 2018 17:16:34 -0400
Subject: [PATCH] - Handle the disapperance of net-tools   + Use ip route
 command when the route command is not available

---
 azurelinuxagent/common/osutil/default.py  | 22 +++++++++++++++++-----
 azurelinuxagent/common/utils/shellutil.py |  5 +++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py
index 0d637b5..6f3dd73 100644
--- a/azurelinuxagent/common/osutil/default.py
+++ b/azurelinuxagent/common/osutil/default.py
@@ -901,7 +901,10 @@ class DefaultOSUtil(object):
         return endpoint
 
     def is_missing_default_route(self):
-        routes = shellutil.run_get_output("route -n")[1]
+        route_cmd = "route -n"
+        if not shellutil.has_command("route"):
+            route_cmd = "ip route show"
+        routes = shellutil.run_get_output(route_cmd)[1]
         for route in routes.split("\n"):
             if route.startswith("0.0.0.0 ") or route.startswith("default "):
                return False
@@ -914,11 +917,18 @@ class DefaultOSUtil(object):
         return self.get_first_if()[1]
 
     def set_route_for_dhcp_broadcast(self, ifname):
-        return shellutil.run("route add 255.255.255.255 dev {0}".format(ifname),
+        route_cmd = "route add"
+        if not shellutil.has_command("route"):
+            route_cmd = "ip route add"
+        return shellutil.run("{0} 255.255.255.255 dev {1}".format(
+            route_cmd, ifname),
                              chk_err=False)
 
     def remove_route_for_dhcp_broadcast(self, ifname):
-        shellutil.run("route del 255.255.255.255 dev {0}".format(ifname),
+        route_cmd = "route del"
+        if not shellutil.has_command("route"):
+            route_cmd = "ip route del"
+        shellutil.run("{0} 255.255.255.255 dev {1}".format(route_cmd, ifname),
                       chk_err=False)
 
     def is_dhcp_enabled(self):
@@ -950,10 +960,12 @@ class DefaultOSUtil(object):
 
     def route_add(self, net, mask, gateway):
         """
-        Add specified route using /sbin/route add -net.
+        Add specified route 
         """
-        cmd = ("/sbin/route add -net "
+        cmd = ("route add -net "
                "{0} netmask {1} gw {2}").format(net, mask, gateway)
+        if not shellutil.has_command("route"):
+            cmd = "ip route add {0} via {1}".format(net, gateway)
         return shellutil.run(cmd, chk_err=False)
 
     def get_dhcp_pid(self):
diff --git a/azurelinuxagent/common/utils/shellutil.py b/azurelinuxagent/common/utils/shellutil.py
index 990bf48..2508751 100644
--- a/azurelinuxagent/common/utils/shellutil.py
+++ b/azurelinuxagent/common/utils/shellutil.py
@@ -57,6 +57,11 @@ if not hasattr(subprocess, 'check_output'):
 Shell command util functions
 """
 
+def has_command(cmd):
+    """
+    Return True if the given command is on the path
+    """
+    return not run(cmd, False)
 
 def run(cmd, chk_err=True):
     """
-- 
2.13.6

Places

File 0001-Handle-the-disapperance-of-net-tools.patch of Package python-azure-agent (Revision 326a70c46bdb69f8bbc550824b38aab1)

Places