diff options
| author | Mantas Mikulėnas <grawity@gmail.com> | 2014-06-21 13:02:38 +0300 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-25 10:14:18 +0100 |
| commit | 083034b9edeb3313e4550b5ff0c53ab1608406d9 (patch) | |
| tree | dea4a776556a2f6fd5b3adf552925d272ff0aada | |
| parent | ff6ecfdc21b11395e7ca7b1a04cf3e317b36a47e (diff) | |
| download | udisks-083034b9edeb3313e4550b5ff0c53ab1608406d9.tar.gz | |
Detect old (non-Pro) MemoryStick cards
https://bugs.freedesktop.org/show_bug.cgi?id=97592
| -rw-r--r-- | data/80-udisks2.rules | 2 | ||||
| -rw-r--r-- | src/udiskslinuxblock.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules index 2acf5f2..905a08e 100644 --- a/data/80-udisks2.rules +++ b/data/80-udisks2.rules @@ -42,7 +42,7 @@ ENV{ID_VENDOR}=="*IOMEGA*", ENV{ID_MODEL}=="*ZIP*", ENV{ID_DRIVE_FLOPPY_ZIP}="1" # kind of media is - right now we just assume SD KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1" # ditto for memstick -KERNEL=="mspblk[0-9]", SUBSYSTEMS=="memstick", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_MS}="1", ENV{ID_DRIVE_MEDIA_FLASH_MS}="1" +KERNEL=="msblk[0-9]|mspblk[0-9]", SUBSYSTEMS=="memstick", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_MS}="1", ENV{ID_DRIVE_MEDIA_FLASH_MS}="1" # TODO: maybe automatically convert udisks1 properties to udisks2 ones? # (e.g. UDISKS_PRESENTATION_HIDE -> UDISKS_IGNORE) diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c index e266497..ab05daa 100644 --- a/src/udiskslinuxblock.c +++ b/src/udiskslinuxblock.c @@ -354,8 +354,11 @@ update_hints (UDisksLinuxBlock *block, connection_bus = udisks_drive_get_connection_bus (drive); removable = udisks_drive_get_media_removable (drive); if (removable || - (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) || - (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk"))) + g_strcmp0 (connection_bus, "usb") == 0 || + g_strcmp0 (connection_bus, "ieee1394") == 0 || + g_str_has_prefix (device_file, "/dev/mmcblk") || + g_str_has_prefix (device_file, "/dev/msblk") || + g_str_has_prefix (device_file, "/dev/mspblk")) { hint_system = FALSE; hint_auto = TRUE; |