Changeset 18836 in vbox

Timestamp:

Apr 7, 2009 4:35:48 PM (16 years ago)

Author:

vboxsync

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

45842

Message:

VBoxManage/addiscsidisk: beautify the location string a bit when no LUN or a LUN of 0 is specified.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)

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

@@ -926 +926 @@
          * not use slashes to separate the parts, as otherwise only the last
          * element comtaining information will be shown. */
-        CHECK_ERROR_BREAK (a->virtualBox,
-            CreateHardDisk(Bstr ("iSCSI"),
-                           BstrFmt ("%ls|%ls|%ls", server.raw(), target.raw(), lun.raw()),
-                           hardDisk.asOutParam()));
+        if (lun.isEmpty() || lun == "0" || lun == "enc0")
+        {
+            CHECK_ERROR_BREAK (a->virtualBox,
+                CreateHardDisk(Bstr ("iSCSI"),
+                               BstrFmt ("%ls|%ls", server.raw(), target.raw()),
+                               hardDisk.asOutParam()));
+        }
+        else
+        {
+            CHECK_ERROR_BREAK (a->virtualBox,
+                CreateHardDisk(Bstr ("iSCSI"),
+                               BstrFmt ("%ls|%ls|%ls", server.raw(), target.raw(), lun.raw()),
+                               hardDisk.asOutParam()));
+        }
         CheckComRCBreakRC (rc);