From 0e715fe349a0134e8cd634d2b34a124a4fc63bc3 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 8 Oct 2007 13:24:45 -0400 Subject: [PATCH] Updated udev (112 -> 113), and applied changed done upstream to suse rules - ppp and tun += ignore_remove - device mapper snapshots += link_priority=-90 --- filesystem/udev/rules/50-udev-default.rules | 3 ++- filesystem/udev/rules/64-device-mapper.rules | 5 ++++- filesystem/udev/udev.desc | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/filesystem/udev/rules/50-udev-default.rules b/filesystem/udev/rules/50-udev-default.rules index 4f8579d47..cb892a77e 100644 --- a/filesystem/udev/rules/50-udev-default.rules +++ b/filesystem/udev/rules/50-udev-default.rules @@ -20,6 +20,7 @@ KERNEL=="iseries/vtty*", GROUP="modem" KERNEL=="mwave", NAME="modems/%k", GROUP="modem" KERNEL=="ttyUSB*", ATTRS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot" KERNEL=="ttyUSB*", ATTRS{product}=="[Hh]andspring*Treo*|[Hh]andspring*Visor*", SYMLINK+="pilot" +KERNEL=="ppp", MODE="0600", OPTIONS+="ignore_remove" # video/graphics SUBSYSTEM=="video4linux", GROUP="video" @@ -62,7 +63,7 @@ KERNEL=="rioctl", NAME="specialix_rioctl", SYMLINK+="%k" KERNEL=="sxctl", NAME="specialix_sxctl", SYMLINK+="%k" # network -KERNEL=="tun", NAME="net/%k", MODE="0666" +KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove" # misc devices KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" diff --git a/filesystem/udev/rules/64-device-mapper.rules b/filesystem/udev/rules/64-device-mapper.rules index 84fd417ce..b6f84959e 100644 --- a/filesystem/udev/rules/64-device-mapper.rules +++ b/filesystem/udev/rules/64-device-mapper.rules @@ -11,10 +11,13 @@ ENV{DM_NAME}!="?*", GOTO="device_mapper_end" SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" -ENV{DM_STATE}!="ACTIVE", GOTO="device_mapper_end" +ENV{DM_STATE}=="SUSPENDED", GOTO="device_mapper_end" ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end" IMPORT{program}="vol_id --export $tempnode" + OPTIONS="link_priority=-100" +ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS="link_priority=-90" + ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" diff --git a/filesystem/udev/udev.desc b/filesystem/udev/udev.desc index c80cd4941..954b0654a 100644 --- a/filesystem/udev/udev.desc +++ b/filesystem/udev/udev.desc @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 112 +[V] 113 [P] X -?---5---9 102.030 -[D] 4159244877 udev-112.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ +[D] 3866956235 udev-113.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/