From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 7 Mar 2011 15:10:50 +0000 (+0100)
Subject: udev-acl: move sg rule to optical drive rule
X-Git-Tag: 174~239
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=71e65e8683b00b72a6bce33f0e2a3f6d1ac9f7b8;hp=37d3d6abdec495769d4c92f3ba1b4c1b1936a831

udev-acl: move sg rule to optical drive rule
---

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index b0015b61d..dd5a7ab13 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -21,6 +21,7 @@ ENV{ID_HPLIP}=="1", TAG+="udev-acl"
 
 # optical drives
 SUBSYSTEM=="block", ENV{ID_CDROM}=="1", TAG+="udev-acl"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", TAG+="udev-acl"
 
 # sound devices
 SUBSYSTEM=="sound", TAG+="udev-acl"
@@ -63,9 +64,6 @@ ENV{DDC_DEVICE}=="*?", TAG+="udev-acl"
 # media player raw devices (for user-mode drivers, Android SDK, etc.)
 SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="udev-acl"
 
-# /dev/sgX nodes for CD-ROM drives
-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", TAG+="udev-acl"
-
 # apply ACL for all locally logged in users
 LABEL="acl_apply", TAG=="udev-acl", TEST=="/var/run/ConsoleKit/database", \
   RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"