Changeset 3619 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 15, 2007 6:46:23 PM (17 years ago)

Author:

vboxsync

Message:

VBoxManage: When specifying the host DVD drive, also check the real name (e.g. /dev/cdrom > /dev/hda)

File:

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

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

@@ -3652 +3652 @@
                 if (!hostDVDDrive)
                 {
-                    errorArgument("Invalid host DVD drive name");
-                    rc = E_FAIL;
-                    break;
+                    /* 2nd try: try with the real name, important on Linux+libhal */
+                    char szPathReal[RTPATH_MAX];
+                    if (VBOX_FAILURE(RTPathReal(dvd + 5, szPathReal, sizeof(szPathReal))))
+                    {
+                        errorArgument("Invalid host DVD drive name");
+                        rc = E_FAIL;
+                        break;
+                    }
+                    rc = hostDVDs->FindByName(Bstr(szPathReal), hostDVDDrive.asOutParam());
+                    if (!hostDVDDrive)
+                    {
+                        errorArgument("Invalid host DVD drive name");
+                        rc = E_FAIL;
+                        break;
+                    }
                 }
                 CHECK_ERROR(dvdDrive, CaptureHostDrive(hostDVDDrive));