Changeset 94532 in vbox

Timestamp:

Apr 8, 2022 4:28:32 PM (3 years ago)

Author:

vboxsync

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

150883

Message:

Main/Unattended: ​​bugref:9781. Adding a new attribute to IUNattended to indicate if network is accessible.

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/debian_preseed.cfg (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/UnattendedImpl.h (modified) (3 diffs)
• src-server/UnattendedImpl.cpp (modified) (3 diffs)
• src-server/UnattendedScript.cpp (modified) (1 diff)
• testcase/tstUnattendedScript.cpp (modified) (2 diffs)

trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg

@@ -40 +40 @@
 d-i base-installer/kernel/override-image string linux-image-amd64
 d-i pkgsel/install-language-support boolean false
+
+@@VBOX_COND_IS_NETWORK_INACCESSIBLE@@
+d-i apt-setup/use_mirror boolean false
+d-i netcfg/no_default_route true
+d-i netcfg/get_nameservers ""
+@@VBOX_COND_END@@
+
 @@VBOX_COND_IS_NOT_MINIMAL_INSTALLATION@@
 d-i apt-setup/restricted boolean true

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4676 +4676 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="6f89464f-7193-426c-a4df-592e4e537fa0"
+    uuid="6f89464f-7773-426c-a4df-592e4e537fa0"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="16"
@@ -5014 +5014 @@
       </desc>
     </attribute>
+
     <attribute name="detectedImageNames" type="wstring" readonly="yes" safearray="yes">
       <desc>
@@ -5035 +5036 @@
         whether unattended install is supported or not. Note that failing detecting
         OS type from the ISO causes this attribute to be false by default.
+      </desc>
+    </attribute>
+
+    <attribute name="isNetworkAccessible" type="boolean">
+      <desc>
+        Indicates whether internet is accessible. Currently setting this to
+        false configures debian preseed files so that package mirrors are not
+        used.
       </desc>
     </attribute>

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

@@ -100 +100 @@
     bool           i_isFirmwareEFI() const;
     Utf8Str const &i_getDetectedOSVersion();
-
+    bool           i_getIsNetworkAccessible() const;
 
 private:
@@ -148 +148 @@
     Utf8Str         mStrDetectedOSHints;
     RTCList<WIMImage> mDetectedImages;
+    bool            mfIsNetworkAccessible;
     /** @} */
 
@@ -232 +233 @@
     HRESULT getDetectedImageIndices(std::vector<ULONG> &aDetectedImageIndices);
     HRESULT getIsUnattendedInstallSupported(BOOL *aIsUnattendedInstallSupported);
+    HRESULT getIsNetworkAccessible(BOOL *aIsNetworkAccessible);
+    HRESULT setIsNetworkAccessible(BOOL aIsNetworkAccessible);
     //internal functions
 

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

@@ -242 +242 @@
     : mhThreadReconfigureVM(NIL_RTNATIVETHREAD), mfRtcUseUtc(false), mfGuestOs64Bit(false)
     , mpInstaller(NULL), mpTimeZoneInfo(NULL), mfIsDefaultAuxiliaryBasePath(true), mfDoneDetectIsoOS(false)
+    , mfIsNetworkAccessible(true)
 { }
 
@@ -3642 +3643 @@
 }
 
+HRESULT Unattended::getIsNetworkAccessible(BOOL *aIsNetworkAccessible)
+{
+    *aIsNetworkAccessible = mfIsNetworkAccessible;
+    return S_OK;
+}
+
+HRESULT Unattended::setIsNetworkAccessible(BOOL aIsNetworkAccessible)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
+    mfIsNetworkAccessible = RT_BOOL(aIsNetworkAccessible);
+    return S_OK;
+}
+
 /*
  * Getters that the installer and script classes can use.
@@ -3816 +3831 @@
     Assert(isReadLockedOnCurrentThread());
     return mStrDetectedOSVersion;
+}
+
+bool Unattended::i_getIsNetworkAccessible() const
+{
+    Assert(isReadLockedOnCurrentThread());
+    return mfIsNetworkAccessible;
 }
 

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

@@ -793 +793 @@
     else if (IS_PLACEHOLDER_MATCH("HAS_PROXY"))
         *pfOutputting = mpUnattended->i_getProxy().isNotEmpty();
+    else if (IS_PLACEHOLDER_MATCH("IS_NETWORK_ACCESSIBLE"))
+        *pfOutputting = !mpUnattended->i_getIsNetworkAccessible();
     else
         return mpSetError->setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Unknown conditional placeholder '%.*s'"),

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -457 +457 @@
 }
 
+HRESULT Unattended::getIsNetworkAccessible(BOOL *aIsNetworkAccessible)
+{
+    RT_NOREF(aIsNetworkAccessible);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setIsNetworkAccessible(BOOL aIsNetworkAccessible)
+{
+    RT_NOREF(aIsNetworkAccessible);
+    return E_NOTIMPL;
+}
+
+
 /*
  * Getters that the installer and script classes can use.
@@ -603 +616 @@
 {
     return mStrDetectedOSVersion;
+}
+
+bool Unattended::i_getIsNetworkAccessible() const
+{
+    return mfIsNetworkAccessible;
 }