apt-pkg/contrib/cdromutl.{cc,h}: add FindMountPointForDevice helper; apt-pkg/cdrom.cc: deal with missing FSTAB_DIR

1 files changed, 7 insertions, 0 deletions

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 3dc7e9924..86fe45fbe 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -882,6 +882,8 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
    udev_ctx = udev_new();
    enumerate = udev_enumerate_new (udev_ctx);
    udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+   //FIXME: just use removalble here to include usb etc
+   //udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
 
    udev_enumerate_scan_devices (enumerate);
    devices = udev_enumerate_get_list_entry (enumerate);
@@ -894,6 +896,11 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 	 continue;
       const char* devnode = udev_device_get_devnode(udevice);
       const char* mountpath = udev_device_get_property_value(udevice, "FSTAB_DIR");
+      if (mountpath == NULL)
+         mountpath = FindMountPointForDevice(devnode);
+
+      if (_config->FindB("Debug::Acquire::cdrom", false))
+         cerr << "found " << devnode << " mounted on " << mountpath << endl;
 
       // fill in the struct
       cdrom.DeviceName = string(devnode);