[PATCH] warn when iproute2 or bridge-utils are missing

[Scott Parish <srparish@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

The attached patch checks for "ip" and "brctl" in the path, and warns
the user if they are not found.

sRp

-- 
Scott Parish


[-- Attachment #2: check_network_packages.patch --]
[-- Type: text/plain, Size: 1181 bytes --]

diff -rN -u xen-2.0.4-old/tools/misc/xend xen-2.0.4-new/tools/misc/xend
--- xen-2.0.4-old/tools/misc/xend	2005-02-04 13:38:37.000000000 +0000
+++ xen-2.0.4-new/tools/misc/xend	2005-02-25 19:00:55.000000000 +0000
@@ -89,12 +89,30 @@
         msg("Xend must be run as root.")
         hline()
         raise CheckError("invalid user")
+
+def check_network_packages():
+    """Check that iproute2 and bridge-utils are installed.
+    """
+    def file_in_path(file):
+        return reduce(lambda a, b: a or b,
+                      [os.path.isfile(os.path.join(dir, file)) for
+                       dir in os.getenv("PATH").split(os.path.pathsep)], 0)
+    if not file_in_path("ip"):
+        hline()
+        msg("Warning: 'ip' not found in path: verify iproute2 is installed")
+        hline()
+    if not file_in_path("brctl"):
+        hline()
+        msg("Warning: 'brctl' not found in path: verify bridge-utils is installed")
+        hline()
+    
     
 def main():
     try:
         check_logging()
         check_twisted_version()
         check_user()
+        check_network_packages()
     except CheckError:
         sys.exit(1)
     daemon = SrvDaemon.instance()