Changeset 102538 in vbox

Timestamp:

Dec 8, 2023 12:11:05 PM (15 months ago)

Author:

vboxsync

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

160684

Message:

VBoxManage/Unattended: Renamed the option "--password" to "--user-password" (kept "--password" for backwards compatibility though) and added option "--admin-password". 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) (3 diffs)

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

@@ -60 +60 @@
       <arg choice="req">--iso=<replaceable>install-iso</replaceable></arg>
       <arg>--user=<replaceable>login</replaceable></arg>
-      <arg>--password=<replaceable>password</replaceable></arg>
+      <arg>--user-password=<replaceable>password</replaceable></arg>
+      <arg>--admin-password=<replaceable>password</replaceable></arg>
       <arg>--password-file=<replaceable>file</replaceable></arg>
       <arg>--full-user-name=<replaceable>name</replaceable></arg>
@@ -130 +131 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--password=<replaceable>password</replaceable></option></term>
-          <listitem>
-            <para>The login password.  This is used for the user given by <option>--user</option> as well as the
-              root/administrator user.  (default: changeme)</para></listitem>
+          <term><option>--user-password=<replaceable>password</replaceable></option></term>
+          <listitem>
+            <para>The user login password.  This is used for the user given by <option>--user</option>
+              (default: changeme)</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--admin-password=<replaceable>password</replaceable></option></term>
+          <listitem>
+            <para>The admin / root login password.  If not specified, the password from <option>--user-password</option>
+              will be used.</para></listitem>
         </varlistentry>
         <varlistentry>

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

@@ -2131 +2131 @@
      * Parse options.
      */
+    enum kUnattendedInstallOpt
+    {
+        kUnattendedInstallOpt_AdminPassword = 1000
+    };
     static const RTGETOPTDEF s_aOptions[] =
     {
         { "--iso",                              'i', RTGETOPT_REQ_STRING },
         { "--user",                             'u', RTGETOPT_REQ_STRING },
-        { "--password",                         'p', RTGETOPT_REQ_STRING }, /* Sets the user password. Keep for backwards compatibility! */
+        { "--password",                         'p', RTGETOPT_REQ_STRING }, /* Keep for backwards compatibility! */
+        { "--user-password",                    'p', RTGETOPT_REQ_STRING },
+        { "--admin-password",                   kUnattendedInstallOpt_AdminPassword, RTGETOPT_REQ_STRING },
         { "--full-user-name",                   'U', RTGETOPT_REQ_STRING },
         { "--key",                              'k', RTGETOPT_REQ_STRING },
@@ -2193 +2199 @@
                 break;
 
-            case 'p':   // --password
+            case 'p':   // --[user-]password
                 CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(UserPassword)(Bstr(ValueUnion.psz).raw()), RTEXITCODE_FAILURE);
+                break;
+
+            case kUnattendedInstallOpt_AdminPassword: // --admin-password
+                CHECK_ERROR2_RET(hrc, ptrUnattended, COMSETTER(AdminPassword)(Bstr(ValueUnion.psz).raw()), RTEXITCODE_FAILURE);
                 break;
 
@@ -2412 +2422 @@
     SHOW_STR_ATTR(User,                          "user");
     SHOW_STR_ATTR(UserPassword,                  "password"); /* Keep for backwards compatibility! */
+    SHOW_STR_ATTR(UserPassword,                  "user-password");
+    SHOW_STR_ATTR(AdminPassword,                 "admin-password");
     SHOW_STR_ATTR(FullUserName,                  "fullUserName");
     SHOW_STR_ATTR(ProductKey,                    "productKey");