Changeset 95436 in vbox for trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp

Timestamp:

Jun 29, 2022 6:18:57 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152040

Message:

Main/UnattendedInstall: Minimalistic support for FreeBSD >= 10.0 sitting in my tree for too long, bugref:9781

File:

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

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

@@ -102 +102 @@
                 pUinstaller = new UnattendedOracleLinux6Installer(pParent);
         }
+        else if (enmDetectedOSType >= VBOXOSTYPE_FreeBSD && enmDetectedOSType <= VBOXOSTYPE_FreeBSD_x64)
+            pUinstaller = new UnattendedFreeBsdInstaller(pParent);
 #if 0 /* doesn't work, so convert later. */
         else if (enmDetectedOSType == VBOXOSTYPE_OpenSUSE || enmDetectedOSType == VBOXOSTYPE_OpenSUSE_x64)
@@ -1502 +1504 @@
 }
 #endif
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+/*
+*
+*
+*  Implementation UnattendedFreeBsdInstaller functions
+*
+*/
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+HRESULT UnattendedFreeBsdInstaller::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
+                                                             RTVFS hVfsOrgIso, bool fOverwrite)
+{
+    try
+    {
+        RTCString strScriptName;
+        strScriptName = mpParent->i_getAuxiliaryBasePath();
+        strScriptName.append(mMainScript.getDefaultFilename());
+
+        /* Need to retain the original file permissions for executables. */
+        rVecArgs.append() = "--no-file-mode";
+        rVecArgs.append() = "--no-dir-mode";
+
+        rVecArgs.append() = "--import-iso";
+        rVecArgs.append(mpParent->i_getIsoPath());
+
+        rVecArgs.append() = "--file-mode=0444";
+        rVecArgs.append() = "--dir-mode=0555";
+
+        /* Remaster ISO, the installer config has to go into /etc. */
+        rVecArgs.append().append("/etc/installerconfig=").append(strScriptName);
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+
+    /*
+     * Call parent to add the remaining files
+     */
+    return UnattendedInstaller::addFilesToAuxVisoVectors(rVecArgs, rVecFiles, hVfsOrgIso, fOverwrite);
+}