Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

This commit is contained in:
Stephan Raue 2013-08-22 23:07:29 +02:00
commit 369beac09d
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,17 @@
diff -Naur xbmc-12.2-5ba69b6/xbmc/storage/linux/UDevProvider.cpp xbmc-12.2-5ba69b6.patch/xbmc/storage/linux/UDevProvider.cpp
--- xbmc-12.2-5ba69b6/xbmc/storage/linux/UDevProvider.cpp 2013-08-22 21:37:41.543830684 +0200
+++ xbmc-12.2-5ba69b6.patch/xbmc/storage/linux/UDevProvider.cpp 2013-08-22 21:37:34.557825148 +0200
@@ -145,10 +145,12 @@
continue;
}
- // look for usb devices on the usb bus or mounted on /media/usbX (sdcards)
+ // look for usb devices on the usb bus, or mounted on /media/usbX (sdcards) or cdroms
const char *bus = udev_device_get_property_value(device, "ID_BUS");
+ const char *cdrom = udev_device_get_property_value(device, "ID_CDROM");
if (removable &&
((bus && strstr(bus, "usb")) ||
+ (cdrom && strstr(cdrom,"1")) ||
(mountpoint && strstr(mountpoint, "usb"))))
{
const char *label = udev_device_get_property_value(device, "ID_FS_LABEL");