Modify runInstall script for Mandriva 2006.0

diff --git a/runInstall b/runInstall
index e4811f1d14d11bd59088ff4c65d541f81469f2a7..2166b2ee44db6cf6408c399e225d4a2fe7c0b34d 100755 (executable)
--- a/runInstall
+++ b/runInstall
@@ -869,6 +869,7 @@ if __name__ == "__main__":
             # - Red Hat Linux 9
             # - Mandrake Linux 10.1
             # - Scientific Linux 3.0.5
+           # - Mandriva 2006.0
             data = open("/etc/redhat-release").readline()
            res = re.search(r'(.*)[L|l]inux.*release\s+([\d.]*)', data)
            if res:
@@ -878,13 +879,13 @@ if __name__ == "__main__":
             # - Debian 3.1
             plt_name = "Debian"
             plt_ver = open("/etc/debian_version").readline().strip()
-        _xml_file_name = "config_%s_%s.xml"%(plt_name, plt_ver)
-        if plt_name and plt_ver and os.path.exists("%s/%s"%(cur_dir, _xml_file_name)):
-            xml_file_name = _xml_file_name
-        elif os.path.exists("/etc/mandriva_release"):
-            # - Mandriva 2006
-            plt_name = "Mandriva"
-            plt_ver = open("/etc/mandriva_release").readline().strip()
+        elif os.path.exists("/etc/mandriva-release"):
+            # - Mandriva 2006 (an additional check if above check fails)
+            data = open("/etc/mandriva-release").readline()
+           res = re.search(r'(.*)[L|l]inux.*release\s+([\d.]*)', data)
+           if res:
+                plt_name = "".join(res.group(1).split())
+                plt_ver  = res.group(2)
         _xml_file_name = "config_%s_%s.xml"%(plt_name, plt_ver)
         if plt_name and plt_ver and os.path.exists("%s/%s"%(cur_dir, _xml_file_name)):
             xml_file_name = _xml_file_name