diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-01 12:17:22 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-05 17:23:56 +0100 |
| commit | 12a362be5c1982f80dbfb75bda070208a2c99cdf (patch) | |
| tree | 1f02a514c1675e38628fdce89fc3cf890dec19c2 /rules | |
| parent | c096407caaf1f3c03bb816e195eebb886662b03a (diff) | |
use libexecdir, bindir, sbindir, switch to /usr/lib/udev in documentation
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/.gitignore | 2 | ||||
| -rw-r--r-- | rules/rules.d/60-persistent-storage.rules.in (renamed from rules/rules.d/60-persistent-storage.rules) | 6 | ||||
| -rw-r--r-- | rules/rules.d/80-drivers.rules | 12 | ||||
| -rw-r--r-- | rules/rules.d/80-drivers.rules.in | 12 |
4 files changed, 17 insertions, 15 deletions
diff --git a/rules/.gitignore b/rules/.gitignore new file mode 100644 index 0000000000..7240bd79d6 --- /dev/null +++ b/rules/.gitignore @@ -0,0 +1,2 @@ +rules.d/60-persistent-storage.rules +rules.d/80-drivers.rules diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules.in index 894b50ba8e..47185386cd 100644 --- a/rules/rules.d/60-persistent-storage.rules +++ b/rules/rules.d/60-persistent-storage.rules.in @@ -66,12 +66,12 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" # probe filesystem metadata of optical drives which have a media inserted -KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" +KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="@sbindir@/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" # single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET -KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" +KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="@sbindir@/blkid -o udev -p -u noraid $tempnode" # probe filesystem metadata of disks -KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" +KERNEL!="sr*", IMPORT{program}="@sbindir@/blkid -o udev -p $tempnode" # watch metadata changes by tools closing the device after writing KERNEL!="sr*", OPTIONS+="watch" diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules deleted file mode 100644 index cf89735d62..0000000000 --- a/rules/rules.d/80-drivers.rules +++ /dev/null @@ -1,12 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="drivers_end" - -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -bv $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -bv tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -bv tifm_ms" -SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -bv --all ms_block mspro_block" -SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev" - -LABEL="drivers_end" diff --git a/rules/rules.d/80-drivers.rules.in b/rules/rules.d/80-drivers.rules.in new file mode 100644 index 0000000000..96161357eb --- /dev/null +++ b/rules/rules.d/80-drivers.rules.in @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="drivers_end" + +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="@sbindir@/modprobe -bv $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="@sbindir@/modprobe -bv tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="@sbindir@/modprobe -bv tifm_ms" +SUBSYSTEM=="memstick", RUN+="@sbindir/modprobe -bv --all ms_block mspro_block" +SUBSYSTEM=="i2o", RUN+="@sbindir@/modprobe -bv i2o_block" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="@sbindir@/modprobe -bv ppdev" + +LABEL="drivers_end" |