Changeset 94533 in vbox

Timestamp:

Apr 8, 2022 5:09:45 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: ​​bugref:9781. Renaming the newly added attribute.

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/debian_preseed.cfg (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 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

@@ -41 +41 @@
 d-i pkgsel/install-language-support boolean false
 
-@@VBOX_COND_IS_NETWORK_INACCESSIBLE@@
+@@VBOX_COND_AVOID_UPDATES_OVER_NETWORK@@
 d-i apt-setup/use_mirror boolean false
 d-i netcfg/no_default_route true

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

@@ -4676 +4676 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="6f89464f-7773-426c-a4df-592e4e537fa0"
+    uuid="6f89464f-7773-436a-a4df-592e4e537fa0"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="16"
@@ -5039 +5039 @@
     </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.
+    <attribute name="avoidUpdatesOverNetwork" type="boolean">
+      <desc>
+        When set to true installation is configured to abstain from
+        using network to update/get data. Especially useful when network
+        is not available (as in our test boxes).
       </desc>
     </attribute>

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

@@ -100 +100 @@
     bool           i_isFirmwareEFI() const;
     Utf8Str const &i_getDetectedOSVersion();
-    bool           i_getIsNetworkAccessible() const;
+    bool           i_getAvoidUpdatesOverNetwork() const;
 
 private:
@@ -148 +148 @@
     Utf8Str         mStrDetectedOSHints;
     RTCList<WIMImage> mDetectedImages;
-    bool            mfIsNetworkAccessible;
+    bool            mfAvoidUpdatesOverNetwork;
     /** @} */
 
@@ -233 +233 @@
     HRESULT getDetectedImageIndices(std::vector<ULONG> &aDetectedImageIndices);
     HRESULT getIsUnattendedInstallSupported(BOOL *aIsUnattendedInstallSupported);
-    HRESULT getIsNetworkAccessible(BOOL *aIsNetworkAccessible);
-    HRESULT setIsNetworkAccessible(BOOL aIsNetworkAccessible);
+    HRESULT getAvoidUpdatesOverNetwork(BOOL *aAvoidUpdatesOverNetwork);
+    HRESULT setAvoidUpdatesOverNetwork(BOOL aAvoidUpdatesOverNetwork);
     //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)
+    , mfAvoidUpdatesOverNetwork(false)
 { }
 
@@ -3643 +3643 @@
 }
 
-HRESULT Unattended::getIsNetworkAccessible(BOOL *aIsNetworkAccessible)
-{
-    *aIsNetworkAccessible = mfIsNetworkAccessible;
-    return S_OK;
-}
-
-HRESULT Unattended::setIsNetworkAccessible(BOOL aIsNetworkAccessible)
+HRESULT Unattended::getAvoidUpdatesOverNetwork(BOOL *aAvoidUpdatesOverNetwork)
+{
+    *aAvoidUpdatesOverNetwork = mfAvoidUpdatesOverNetwork;
+    return S_OK;
+}
+
+HRESULT Unattended::setAvoidUpdatesOverNetwork(BOOL aAvoidUpdatesOverNetwork)
 {
     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);
+    mfAvoidUpdatesOverNetwork = RT_BOOL(aAvoidUpdatesOverNetwork);
     return S_OK;
 }
@@ -3833 +3833 @@
 }
 
-bool Unattended::i_getIsNetworkAccessible() const
+bool Unattended::i_getAvoidUpdatesOverNetwork() const
 {
     Assert(isReadLockedOnCurrentThread());
-    return mfIsNetworkAccessible;
+    return mfAvoidUpdatesOverNetwork;
 }
 

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 if (IS_PLACEHOLDER_MATCH("AVOID_UPDATES_OVER_NETWORK"))
+        *pfOutputting = mpUnattended->i_getAvoidUpdatesOverNetwork();
     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);
+HRESULT Unattended::getAvoidUpdatesOverNetwork(BOOL *aAvoidUpdatesOverNetwork)
+{
+    RT_NOREF(aAvoidUpdatesOverNetwork);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setAvoidUpdatesOverNetwork(BOOL aAvoidUpdatesOverNetwork)
+{
+    RT_NOREF(aAvoidUpdatesOverNetwork);
     return E_NOTIMPL;
 }
@@ -618 +618 @@
 }
 
-bool Unattended::i_getIsNetworkAccessible() const
-{
-    return mfIsNetworkAccessible;
+bool Unattended::i_getAvoidUpdatesOverNetwork() const
+{
+    return mfAvoidUpdatesOverNetwork;
 }