Changeset 95436 in vbox

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

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/Makefile.kmk (modified) (1 diff)
• UnattendedTemplates/freebsd_installer.cfg (added)
• UnattendedTemplates/freebsd_postinstall.sh (added)
• include/UnattendedImpl.h (modified) (1 diff)
• include/UnattendedInstaller.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (2 diffs)
• src-server/UnattendedInstaller.cpp (modified) (2 diffs)

trunk/src/VBox/Main/UnattendedTemplates/Makefile.kmk

@@ -44 +44 @@
         ol_postinstall.sh \
         os2_cid_install.cmd \
-        win_postinstall.cmd
+        win_postinstall.cmd \
+        freebsd_installer.cfg \
+        freebsd_postinstall.sh
 
  ifndef VBOX_WITH_OPEN_WATCOM

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -257 +257 @@
     HRESULT i_innerDetectIsoOSLinux(RTVFS hVfsIso, DETECTBUFFER *puBuf);
     HRESULT i_innerDetectIsoOSOs2(RTVFS hVfsIso, DETECTBUFFER *puBuf);
+    HRESULT i_innerDetectIsoOSFreeBsd(RTVFS hVfsIso, DETECTBUFFER *puBuf);
 
     /**

trunk/src/VBox/Main/include/UnattendedInstaller.h

@@ -845 +845 @@
 #endif
 
+/**
+ * Base class for the unattended FreeBSD installers.
+ */
+class UnattendedFreeBsdInstaller : public UnattendedInstaller
+{
+public:
+    UnattendedFreeBsdInstaller(Unattended *pParent)
+        : UnattendedInstaller(pParent,
+                              "freebsd_installer.cfg", "freebsd_postinstall.sh",
+                              "installerconfig", "vboxpostinstall.sh") {}
+    ~UnattendedFreeBsdInstaller() {}
+
+    bool isAuxiliaryIsoNeeded() const       { return true;  }
+    bool isOriginalIsoNeeded() const        { return false; }
+
+protected:
+    HRESULT addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
+                                     RTVFS hVfsOrgIso, bool fOverwrite);
+};
+
 #endif /* !MAIN_INCLUDED_UnattendedInstaller_h */

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

@@ -449 +449 @@
     if (hrc == S_FALSE && mEnmOsType == VBOXOSTYPE_Unknown)
         hrc = i_innerDetectIsoOSOs2(hVfsIso, &uBuf);
+    if (hrc == S_FALSE && mEnmOsType == VBOXOSTYPE_Unknown)
+        hrc = i_innerDetectIsoOSFreeBsd(hVfsIso, &uBuf);
     if (mEnmOsType != VBOXOSTYPE_Unknown)
     {
@@ -2156 +2158 @@
 
 
+/**
+ * Detect FreeBSD distro ISOs.
+ *
+ * @returns COM status code.
+ * @retval  S_OK if detected
+ * @retval  S_FALSE if not fully detected.
+ *
+ * @param   hVfsIso     The ISO file system.
+ * @param   pBuf        Read buffer.
+ */
+HRESULT Unattended::i_innerDetectIsoOSFreeBsd(RTVFS hVfsIso, DETECTBUFFER *pBuf)
+{
+    RT_NOREF(pBuf);
+
+    /*
+     * FreeBSD since 10.0 has a .profile file in the root which can be used to determine that this is FreeBSD
+     * along with the version.
+     */
+
+    RTVFSFILE hVfsFile;
+    HRESULT hrc = S_FALSE;
+    int vrc = RTVfsFileOpen(hVfsIso, ".profile", RTFILE_O_READ | RTFILE_O_DENY_NONE | RTFILE_O_OPEN, &hVfsFile);
+    if (RT_SUCCESS(vrc))
+    {
+        static const uint8_t s_abFreeBsdHdr[] = "# $FreeBSD: releng/";
+        char abRead[32];
+
+        vrc = RTVfsFileRead(hVfsFile, &abRead[0], sizeof(abRead), NULL /*pcbRead*/);
+        if (   RT_SUCCESS(vrc)
+            && !memcmp(&abRead[0], &s_abFreeBsdHdr[0], sizeof(s_abFreeBsdHdr) - 1)) /* Skip terminator */
+        {
+            abRead[sizeof(abRead) - 1] = '\0';
+
+            /* Detect the architecture using the volume label. */
+            char szVolumeId[128];
+            size_t cchVolumeId;
+            vrc = RTVfsQueryLabel(hVfsIso, szVolumeId, 128, &cchVolumeId);
+            if (RT_SUCCESS(vrc))
+            {
+                /* Can re-use the Linux code here. */
+                if (!detectLinuxArchII(szVolumeId, &mEnmOsType, VBOXOSTYPE_FreeBSD))
+                    LogRel(("Unattended/FBSD: Unknown: arch='%s'\n", szVolumeId));
+
+                /* Detect the version from the string coming after the needle in .profile. */
+                AssertCompile(sizeof(s_abFreeBsdHdr) - 1 < sizeof(abRead));
+
+                char *pszVersionStart = &abRead[sizeof(s_abFreeBsdHdr) - 1];
+                char *pszVersionEnd = pszVersionStart;
+
+                while (RT_C_IS_DIGIT(*pszVersionEnd))
+                    pszVersionEnd++;
+                if (*pszVersionEnd == '.')
+                {
+                    pszVersionEnd++; /* Skip the . */
+
+                    while (RT_C_IS_DIGIT(*pszVersionEnd))
+                        pszVersionEnd++;
+
+                    /* Terminate the version string. */
+                    *pszVersionEnd = '\0';
+
+                    try { mStrDetectedOSVersion = pszVersionStart; }
+                    catch (std::bad_alloc &) { hrc = E_OUTOFMEMORY; }
+                }
+                else
+                    LogRel(("Unattended/FBSD: Unknown: version='%s'\n", &abRead[0]));
+            }
+            else
+            {
+                LogRel(("Unattended/FBSD: No Volume Label found\n"));
+                mEnmOsType = VBOXOSTYPE_FreeBSD;
+            }
+
+            hrc = S_OK;
+        }
+
+        RTVfsFileRelease(hVfsFile);
+    }
+
+    return hrc;
+}
+
+
 HRESULT Unattended::prepare()
 {

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);
+}