← Back to branch summary

~ubuntu-branches/ubuntu/utopic/udisks/utopic-proposed

« back to all changes in this revision

Viewing changes to data/80-udisks.rules

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-04-02 12:21:43 UTC
  • mfrom: (31.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20120402122143-qlmqluwpipmru6j5
Tags: 1.0.4-5ubuntu1
https://launchpad.net/bugs/343363
* Merge with Debian unstable. Remaining Ubuntu changes:
  - debian/control: Change the "cryptsetup" suggests to a "cryptsetup-bin"
    recommends, so that LUKS functionality works by default. This change
    needs to be kept in Ubuntu until the cryptsetup package split goes into
    Debian as well. (LP: #343363)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/80-udisks.rules
146
146
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*SM_Reader*", ENV{ID_DRIVE_FLASH_SM}="1"
147
147
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*MS_Reader*", ENV{ID_DRIVE_FLASH_MS}="1"
148
148
 
 
149
# TODO: figure out if the drive supports SD and SDHC and what the current
 
150
# kind of media is - right now we just assume SD
 
151
KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
152
KERNEL=="mspblk[0-9]", SUBSYSTEMS=="memstick", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_MS}="1", ENV{ID_DRIVE_MEDIA_FLASH_MS}="1"
 
153
 
149
154
##############################################################################################################
150
155
 
151
156
# If previous rules did not set an icon, provide a default one for media players