Changeset 102540 in vbox for trunk/src

Timestamp:

Dec 8, 2023 12:43:07 PM (17 months ago)

Author:

vboxsync

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

160686

Message:

VBoxManage/Unattended: Added password file support for the admin password. Renamed "--password-file" (kept for backwards compatibility though) to "--user-password-file". Updated docs. bugref:10554

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (4 diffs)

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

@@ -2133 +2133 @@
     enum kUnattendedInstallOpt
     {
-        kUnattendedInstallOpt_AdminPassword = 1000
+        kUnattendedInstallOpt_AdminPassword = 1000,
+        kUnattendedInstallOpt_AdminPasswordFile
     };
     static const RTGETOPTDEF s_aOptions[] =
@@ -2142 +2143 @@
         { "--password-file",                    'X', RTGETOPT_REQ_STRING }, /* Keep for backwards compatibility! */
         { "--user-password",                    'p', RTGETOPT_REQ_STRING },
+        { "--user-password-file",               'X', RTGETOPT_REQ_STRING },
         { "--admin-password",                   kUnattendedInstallOpt_AdminPassword, RTGETOPT_REQ_STRING },
+        { "--admin-password-file",              kUnattendedInstallOpt_AdminPasswordFile, RTGETOPT_REQ_STRING },
         { "--full-user-name",                   'U', RTGETOPT_REQ_STRING },
         { "--key",                              'k', RTGETOPT_REQ_STRING },
@@ -2208 +2211 @@
                 break;
 
-            case 'X':   // --password-file
+            case 'X':   // --[user-]password-file
             {
                 Utf8Str strPassword;
@@ -2215 +2218 @@
                     return rcExit;
                 CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(UserPassword)(Bstr(strPassword).raw()), RTEXITCODE_FAILURE);
+                break;
+            }
+
+            case kUnattendedInstallOpt_AdminPasswordFile:
+            {
+                Utf8Str strPassword;
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
+                if (rcExit != RTEXITCODE_SUCCESS)
+                    return rcExit;
+                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(AdminPassword)(Bstr(strPassword).raw()), RTEXITCODE_FAILURE);
                 break;
             }