Changeset 77774 in vbox

Timestamp:

Mar 19, 2019 12:59:41 AM (6 years ago)

Author:

vboxsync

Message:

Main: Some unattended ubuntu 4.10 installation hacking (unsuccessful).

File:

• trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (4 diffs)

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

@@ -913 +913 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
+/**
+ * Helper for checking if a file exists.
+ * @todo promote to IPRT?
+ */
+static bool hlpVfsFileExists(RTVFS hVfs, const char *pszPath)
+{
+    RTFSOBJINFO ObjInfo;
+    int vrc = RTVfsQueryPathInfo(hVfs, pszPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
+    return RT_SUCCESS(vrc) && RTFS_IS_FILE(ObjInfo.Attr.fMode);
+}
+
 HRESULT UnattendedDebianInstaller::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
                                                             RTVFS hVfsOrgIso, bool fOverwrite)
 {
+    /*
+     * The txt.cfg file used to be called isolinux.txt (ubuntu 4.10
+     * and possible others).
+     */
+    /** @todo Ubuntu 4.10 does not work, as we generate too long command lines
+     *        and the kernel crashes immediately. */
+    const char *pszIsoLinuxTxtCfg = "/isolinux/txt.cfg";
+    if (   !hlpVfsFileExists(hVfsOrgIso, pszIsoLinuxTxtCfg)
+        && hlpVfsFileExists(hVfsOrgIso, "/isolinux/isolinux.txt"))
+        pszIsoLinuxTxtCfg             = "/isolinux/isolinux.txt";
+
     /*
      * VISO bits and filenames.
@@ -935 +957 @@
         /* Remove the two isolinux configure files we'll be replacing. */
         rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
-        rVecArgs.append() = "isolinux/txt.cfg=:must-remove:";
+        rVecArgs.append().assign(&pszIsoLinuxTxtCfg[1]).append("=:must-remove:");
 
         /* Add the replacement files. */
@@ -944 +966 @@
         strTxtCfg = mpParent->i_getAuxiliaryBasePath();
         strTxtCfg.append("isolinux-txt.cfg");
-        rVecArgs.append().append("isolinux/txt.cfg=").append(strTxtCfg);
+        rVecArgs.append().assign(&pszIsoLinuxTxtCfg[1]).append("=").append(strTxtCfg);
     }
     catch (std::bad_alloc &)
@@ -984 +1006 @@
     {
         GeneralTextScript Editor(mpParent);
-        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, "/isolinux/txt.cfg", &Editor);
+        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, pszIsoLinuxTxtCfg, &Editor);
         if (SUCCEEDED(hrc))
             hrc = editDebianTxtCfg(&Editor);