diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-01 04:21:15 +0100 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-01 04:21:15 +0100 |
commit | 220893b3cbdbf8932f95c44811b169a8f0d33939 (patch) | |
tree | 540deaec74df773c5d7973dc3b3bb3d734dc834b /extras | |
parent | eed0832780382298f5df26143a8271f9a4328a9f (diff) |
remove mknod() logic and rely on 'devtmpfs'
Diffstat (limited to 'extras')
-rw-r--r-- | extras/cdrom_id/60-cdrom_id.rules | 4 | ||||
-rw-r--r-- | extras/edd_id/61-persistent-storage-edd.rules | 2 | ||||
-rw-r--r-- | extras/mtd_probe/75-probe_mtd.rules | 2 | ||||
-rw-r--r-- | extras/v4l_id/60-persistent-v4l.rules | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules index 896af34825..353f522b0b 100644 --- a/extras/cdrom_id/60-cdrom_id.rules +++ b/extras/cdrom_id/60-cdrom_id.rules @@ -9,10 +9,10 @@ ENV{DEVTYPE}!="disk", GOTO="cdrom_end" KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" # media eject button pressed -ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $tempnode", GOTO="cdrom_end" +ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdrom_end" # import device and media properties and lock tray to # enable the receiving of media eject button events -IMPORT{program}="cdrom_id --lock-media $tempnode" +IMPORT{program}="cdrom_id --lock-media $devnode" LABEL="cdrom_end" diff --git a/extras/edd_id/61-persistent-storage-edd.rules b/extras/edd_id/61-persistent-storage-edd.rules index 1ab1be347e..6b4fb8ecfe 100644 --- a/extras/edd_id/61-persistent-storage-edd.rules +++ b/extras/edd_id/61-persistent-storage-edd.rules @@ -5,7 +5,7 @@ SUBSYSTEM!="block", GOTO="persistent_storage_edd_end" KERNEL!="sd*|hd*|cciss*", GOTO="persistent_storage_edd_end" # BIOS Enhanced Disk Device -ENV{DEVTYPE}=="disk", IMPORT{program}="edd_id --export $tempnode" +ENV{DEVTYPE}=="disk", IMPORT{program}="edd_id --export $devnode" ENV{DEVTYPE}=="disk", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}" ENV{DEVTYPE}=="partition", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n" diff --git a/extras/mtd_probe/75-probe_mtd.rules b/extras/mtd_probe/75-probe_mtd.rules index 6b0c1c27e6..c0e0839785 100644 --- a/extras/mtd_probe/75-probe_mtd.rules +++ b/extras/mtd_probe/75-probe_mtd.rules @@ -2,7 +2,7 @@ ACTION!="add", GOTO="mtd_probe_end" -KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $tempnode" +KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $devnode" KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl" LABEL="mtd_probe_end" diff --git a/extras/v4l_id/60-persistent-v4l.rules b/extras/v4l_id/60-persistent-v4l.rules index edfd844753..93c5ee8c27 100644 --- a/extras/v4l_id/60-persistent-v4l.rules +++ b/extras/v4l_id/60-persistent-v4l.rules @@ -4,7 +4,7 @@ ACTION=="remove", GOTO="persistent_v4l_end" SUBSYSTEM!="video4linux", GOTO="persistent_v4l_end" ENV{MAJOR}=="", GOTO="persistent_v4l_end" -IMPORT{program}="v4l_id $tempnode" +IMPORT{program}="v4l_id $devnode" SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id" KERNEL=="video*", ENV{ID_SERIAL}=="?*", SYMLINK+="v4l/by-id/$env{ID_BUS}-$env{ID_SERIAL}-video-index$attr{index}" |