Changeset 94533 in vbox for trunk/src/VBox/Main/src-server

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/src-server

Files:

• UnattendedImpl.cpp (modified) (3 diffs)
• UnattendedScript.cpp (modified) (1 diff)

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'"),