Changeset 102540 in vbox

Timestamp:

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

Author:

vboxsync

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

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-unattended.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (4 diffs)

trunk/doc/manual/en_US/man_VBoxManage-unattended.xml

@@ -137 +137 @@
         </varlistentry>
         <varlistentry>
+          <term><option>--user-password-file=<replaceable>file</replaceable></option></term>
+          <listitem>
+            <para>Alternative to <option>--user-password</option> for providing the user password.  Special filename
+              <computeroutput>stdin</computeroutput> can be used to read the password from standard input.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><option>--admin-password=<replaceable>password</replaceable></option></term>
           <listitem>
@@ -143 +149 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--password-file=<replaceable>file</replaceable></option></term>
-          <listitem>
-            <para>Alternative to <option>--password</option> for providing the password.  Special filename
+          <term><option>--admin-password-file=<replaceable>file</replaceable></option></term>
+          <listitem>
+            <para>Alternative to <option>--admin-password</option> for providing the admin / root password.  Special filename
               <computeroutput>stdin</computeroutput> can be used to read the password from standard input.</para></listitem>
         </varlistentry>

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;
             }