Changeset 33361 in vbox

Timestamp:

Oct 22, 2010 2:59:04 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: replace --controller by --disk to allow to rewrite the target path

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (3 diffs)

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

@@ -105 +105 @@
     { "--type",                 'T', RTGETOPT_REQ_UINT32 },     // deprecated
     { "-type",                  'T', RTGETOPT_REQ_UINT32 },     // deprecated
-    { "--controller",           'C', RTGETOPT_REQ_STRING },
+//    { "--controller",           'C', RTGETOPT_REQ_STRING },
+    { "--disk",                 'D', RTGETOPT_REQ_STRING },
 };
 
@@ -207 +208 @@
                     return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --unit argument.", GetState.pDef->pszLong);
                 mapArgsMapsPerVsys[ulCurVsys][Utf8StrFmt("controller%u", ulCurUnit)] = ValueUnion.psz;
+                break;
+
+            case 'D':   // --disk
+                if (ulCurVsys == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                if (ulCurUnit == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --unit argument.", GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys][Utf8StrFmt("disk%u", ulCurUnit)] = ValueUnion.psz;
                 break;
 
@@ -592 +601 @@
                             else
                             {
-                                Utf8StrFmt strTypeArg("controller%u", a);
+                                Utf8StrFmt strTypeArg("disk%u", a);
                                 if (findArgValue(strOverride, pmapArgs, strTypeArg))
                                 {
-                                    // strOverride now has the controller index as a number, but we
-                                    // need a "controller=X" format string
-                                    strOverride = Utf8StrFmt("controller=%s", strOverride.c_str());
-                                    Bstr bstrExtraConfigValue = strOverride;
-                                    bstrExtraConfigValue.detachTo(&aExtraConfigValues[a]);
+                                    RTUUID uuid;
+                                    /* Check if this is a uuid. If so, don't touch. */
+                                    int vrc = RTUuidFromStr(&uuid, strOverride.c_str());
+                                    if (vrc != VINF_SUCCESS)
+                                    {
+                                        /* Make the path absolute. */
+                                        if (!RTPathStartsWithRoot(strOverride.c_str()))
+                                        {
+                                            char pszPwd[RTPATH_MAX];
+                                            vrc = RTPathGetCurrent(pszPwd, RTPATH_MAX);
+                                            if (RT_SUCCESS(vrc))
+                                                strOverride = Utf8Str(pszPwd).append(RTPATH_SLASH).append(strOverride);
+                                        }
+                                    }
+                                    bstrFinalValue = strOverride;
                                     RTPrintf("%2u: Hard disk image: source image=%ls, target path=%ls, %ls\n",
                                             a,
                                             aOvfValues[a],
-                                            aVboxValues[a],
+                                            bstrFinalValue.raw(),
                                             aExtraConfigValues[a]);
                                 }
+//                                Utf8StrFmt strTypeArg("controller%u", a);
+//                                if (findArgValue(strOverride, pmapArgs, strTypeArg))
+//                                {
+                                    // strOverride now has the controller index as a number, but we
+                                    // need a "controller=X" format string
+//                                    strOverride = Utf8StrFmt("controller=%s", strOverride.c_str());
+//                                    Bstr bstrExtraConfigValue = strOverride;
+//                                    bstrExtraConfigValue.detachTo(&aExtraConfigValues[a]);
+//                                    RTPrintf("%2u: Hard disk image: source image=%ls, target path=%ls, %ls\n",
+//                                            a,
+//                                            aOvfValues[a],
+//                                            aVboxValues[a],
+//                                            aExtraConfigValues[a]);
+//                                }
                                 else
                                     RTPrintf("%2u: Hard disk image: source image=%ls, target path=%ls, %ls"