儲存庫 vbox 的更動 67619

時間撮記:

2017-6-26 下午07:11:23 (7 年 以前)

作者:

vboxsync

訊息:

IUnattended: Added props for auxiliary paths.

檔案:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (修改) (5 筆差異)

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

@@ -1277 +1277 @@
     Bstr password;
     Bstr productKey;
+    Bstr auxiliaryCDPath;
+    Bstr auxiliaryFloppyPath;
     Bstr group("group");
     Bstr machineName;
@@ -1297 +1299 @@
         { "--iso-path",             'i', RTGETOPT_REQ_STRING },
         { "--additions-iso-path",   'a', RTGETOPT_REQ_STRING },
+        { "--auxiliary-cd-path",    'c', RTGETOPT_REQ_STRING },
+        { "--auxiliary-floppy-path",'f', RTGETOPT_REQ_STRING },
         { "--image-index",          'm', RTGETOPT_REQ_UINT16 },
         { "--settings-file",        's', RTGETOPT_REQ_STRING },
@@ -1362 +1366 @@
                 break;
 
+            case 'f':  // --auxiliary-floppy-path
+                if (cSpecificOptions < 0)
+                    return errorSyntax(USAGE_UNATTENDEDINSTALL, "--auxiliary-floppy-path cannot be mixed with --settings-file");
+                auxiliaryFloppyPath = ValueUnion.psz;
+                cSpecificOptions++;
+                break;
+
+            case 'c':  // --auxiliary-cd-path
+                if (cSpecificOptions < 0)
+                    return errorSyntax(USAGE_UNATTENDEDINSTALL, "--auxiliary-cd-path cannot be mixed with --settings-file");
+                auxiliaryCDPath = ValueUnion.psz;
+                cSpecificOptions++;
+                break;
+
             case 'm':   // --image-index
                 if (cSpecificOptions < 0)
@@ -1449 +1467 @@
                 return errorSyntax(USAGE_UNATTENDEDINSTALL, "A product key is required (--key).");
 
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(IsoPath)(isoPath.raw()));
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(User)(user.raw()));
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(Password)(password.raw()));
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(ProductKey)(productKey.raw()));
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(AuxiliaryCDPath)(auxiliaryCDPath.raw()));
+            CHECK_ERROR_BREAK(unAttended, COMSETTER(AuxiliaryFloppyPath)(auxiliaryFloppyPath.raw()));
             CHECK_ERROR_BREAK(unAttended, COMSETTER(AdditionsIsoPath)(vboxAdditionsIsoPath.raw()));
-
-            CHECK_ERROR_BREAK(unAttended, COMSETTER(IsoPath)(isoPath.raw()));
-
-            CHECK_ERROR_BREAK(unAttended, COMSETTER(User)(user.raw()));
-
-            CHECK_ERROR_BREAK(unAttended, COMSETTER(Password)(password.raw()));
-
-            CHECK_ERROR_BREAK(unAttended, COMSETTER(ProductKey)(productKey.raw()));
-
             CHECK_ERROR_BREAK(unAttended, COMSETTER(InstallGuestAdditions)(vboxAdditionsIsoPath.isNotEmpty()));
-
             CHECK_ERROR_BREAK(unAttended, COMSETTER(ImageIndex)(imageIndex));
             CHECK_ERROR_BREAK(unAttended,Preparation());
@@ -1538 +1552 @@
         CHECK_ERROR_BREAK(unAttended, COMGETTER(Password)(password.asOutParam()));
         CHECK_ERROR_BREAK(unAttended, COMGETTER(ProductKey)(productKey.asOutParam()));
+        CHECK_ERROR_BREAK(unAttended, COMGETTER(AuxiliaryCDPath)(auxiliaryCDPath.asOutParam()));
+        CHECK_ERROR_BREAK(unAttended, COMGETTER(AuxiliaryFloppyPath)(auxiliaryFloppyPath.asOutParam()));
         imageIndex = 0;
         CHECK_ERROR_BREAK(unAttended, COMGETTER(ImageIndex)(&imageIndex));