Changeset 71012 in vbox for trunk

Timestamp:

Feb 14, 2018 4:14:36 PM (7 years ago)

Author:

vboxsync

Message:

Main,Installer: Made unattended installation work for rhel4 and friends. Special tweak needed for centos version detection. [build fix]

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -740 +740 @@
                            centos-release-4-7.x86_64.rpm, centos-release-4-4.3.i386.rpm
                            centos-release-5-3.el5.centos.1.x86_64.rpm */
-                        char *psz;
                         if (   (psz = strstr(DirEntry.szName, "-release-")) != NULL
                             || (psz = strstr(DirEntry.szName, "-RELEASE-")) != NULL)
@@ -759 +758 @@
 
                     /* Did we find anything relvant? */
-                    char *pszVersion = szRpmDb;
-                    if (!RT_C_IS_DIGIT(*pszVersion))
-                        pszVersion = szReleaseRpm;
-                    if (RT_C_IS_DIGIT(*pszVersion))
+                    psz = szRpmDb;
+                    if (!RT_C_IS_DIGIT(*psz))
+                        psz = szReleaseRpm;
+                    if (RT_C_IS_DIGIT(*psz))
                     {
                         /* Convert '-' to '.' and strip stuff which doesn't look like a version string. */
-                        char *pszCur = pszVersion + 1;
+                        char *pszCur = psz + 1;
                         for (char ch = *pszCur; ch != '\0'; ch = *++pszCur)
                             if (ch == '-')
@@ -774 +773 @@
                                 break;
                             }
-                        while (&pszCur[-1] != pszVersion && pszCur[-1] == '.')
+                        while (&pszCur[-1] != psz && pszCur[-1] == '.')
                             *--pszCur = '\0';
 
                         /* Set it and stop looking. */
-                        try { mStrDetectedOSVersion = pszVersion; }
+                        try { mStrDetectedOSVersion = psz; }
                         catch (std::bad_alloc) { return E_OUTOFMEMORY; }
                         break;