From b69340e442c854c22c2d814dccb63d54576b74e1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 3 Nov 2009 21:50:25 +0100 Subject: [PATCH 3/3] mark LVs as NOPOLICY=1 again Commit a95d3 caused the NOPOLICY rules get cut short for LVs. Move the NOPOLICY check close to the top, since its (1) very cheap, and (2) very generic, i. e. rules further down might want to tweak it for special cases. --- data/95-devkit-disks.rules | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/95-devkit-disks.rules b/data/95-devkit-disks.rules index cff8277..7f210ad 100644 --- a/data/95-devkit-disks.rules +++ b/data/95-devkit-disks.rules @@ -6,6 +6,17 @@ ACTION!="add|change", GOTO="devkit_disks_end" SUBSYSTEM!="block", GOTO="devkit_disks_end" KERNEL=="loop*|ram*", GOTO="devkit_disks_end" +# Mark devices that shouldn't be automounted / autoassembled etc. +# +# Deny all, then punch holes for what looks like physical drives +# (TODO: this heuristic might need some work) +# + +ENV{DKD_PRESENTATION_NOPOLICY}="1" +KERNEL=="sd*|hd*|sr*|mmcblk*|mspblk*", ENV{DKD_PRESENTATION_NOPOLICY}="0" + +############################################################################################################## + # we only care about change events on device-mapper # devices - never touch the device on add events KERNEL=="dm-*", ACTION!="change", GOTO="devkit_disks_end" @@ -152,15 +163,5 @@ ENV{ID_FS_TYPE}=="ntfs|vfat", \ ############################################################################################################## -# Mark devices that shouldn't be automounted / autoassembled etc. -# -# Deny all, then punch holes for what looks like physical drives -# (TODO: this heuristic might need some work) -# - -ENV{DKD_PRESENTATION_NOPOLICY}="1" -KERNEL=="sd*|hd*|sr*|mmcblk*|mspblk*", ENV{DKD_PRESENTATION_NOPOLICY}="0" - -############################################################################################################## LABEL="devkit_disks_end" -- 1.6.3.3