Changeset 102535 in vbox

Timestamp:

Dec 8, 2023 11:26:06 AM (12 months ago)

Author:

vboxsync

Message:

Main/Unattended: Renamed the attribute "IUnattended::password" to "IUnattended::userPassword". Added new getter/setter attribute "IUnattended::adminPassword", to set a dedicated admin / root password. If not specified explicitly, the password from "IUnattended::userPassword" will be used. Extended testcases [forgot to commit files]. bugref:10554

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageMisc.cpp (modified) (4 diffs)
• VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -2135 +2135 @@
         { "--iso",                              'i', RTGETOPT_REQ_STRING },
         { "--user",                             'u', RTGETOPT_REQ_STRING },
-        { "--password",                         'p', RTGETOPT_REQ_STRING },
-        { "--password-file",                    'X', RTGETOPT_REQ_STRING },
+        { "--password",                         'p', RTGETOPT_REQ_STRING }, /* Sets the user password. Keep for backwards compatibility! */
         { "--full-user-name",                   'U', RTGETOPT_REQ_STRING },
         { "--key",                              'k', RTGETOPT_REQ_STRING },
@@ -2195 +2194 @@
 
             case 'p':   // --password
-                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(Password)(Bstr(ValueUnion.psz).raw()), RTEXITCODE_FAILURE);
+                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(UserPassword)(Bstr(ValueUnion.psz).raw()), RTEXITCODE_FAILURE);
                 break;
 
@@ -2204 +2203 @@
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
-                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(Password)(Bstr(strPassword).raw()), RTEXITCODE_FAILURE);
+                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(UserPassword)(Bstr(strPassword).raw()), RTEXITCODE_FAILURE);
                 break;
             }
@@ -2412 +2411 @@
     SHOW_STR_ATTR(IsoPath,                       "isoPath");
     SHOW_STR_ATTR(User,                          "user");
-    SHOW_STR_ATTR(Password,                      "password");
+    SHOW_STR_ATTR(UserPassword,                  "password") /* Keep for backwards compatibility! */
     SHOW_STR_ATTR(FullUserName,                  "fullUserName");
     SHOW_STR_ATTR(ProductKey,                    "productKey");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -615 +615 @@
 {
     AssertReturn(!m_comUnattended.isNull(), QString());
-    return m_comUnattended.GetPassword();
+    return m_comUnattended.GetUserPassword();
 }
 
@@ -621 +621 @@
 {
     AssertReturnVoid(!m_comUnattended.isNull());
-    m_comUnattended.SetPassword(strPassword);
+    m_comUnattended.SetUserPassword(strPassword);
     AssertReturnVoid(checkUnattendedInstallError(m_comUnattended));
 }