summaryrefslogtreecommitdiffstats
path: root/source/a/udev
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/udev')
-rw-r--r--source/a/udev/config/rc.d/rc.udev.new22
-rw-r--r--source/a/udev/config/rules.d/40-slackware.rules3
-rw-r--r--source/a/udev/config/udev.conf2
-rw-r--r--source/a/udev/doinst.sh2
-rw-r--r--source/a/udev/rule_generator.diff14
-rw-r--r--source/a/udev/udev-153.tar.sign8
-rwxr-xr-xsource/a/udev/udev.SlackBuild23
-rw-r--r--source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch305
8 files changed, 340 insertions, 39 deletions
diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new
index 40f38d1de..6a6218f6e 100644
--- a/source/a/udev/config/rc.d/rc.udev.new
+++ b/source/a/udev/config/rc.d/rc.udev.new
@@ -35,8 +35,8 @@ case "$1" in
# Sanity check #2, make sure that a 2.6.x kernel is new enough:
if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then
- if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "27" ]; then
- echo "Sorry, but you need a 2.6.27+ kernel to use udev."
+ if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then
+ echo "Sorry, but you need a 2.6.32+ kernel to use this udev."
echo "Your kernel version is only $(uname -r)."
echo
echo "FATAL: Refusing to run /etc/rc.d/rc.udev."
@@ -48,7 +48,7 @@ case "$1" in
# is not there, this will also shut off this script to prevent further
# problems:
if [ ! -x /sbin/udevd ]; then
- chmod 644 /etc/rc.d/rc.udev
+ chmod 0644 /etc/rc.d/rc.udev
echo "No udevd daemon found."
echo "Turning off udev: chmod 644 /etc/rc.d/rc.udev"
echo "FATAL: Refusing to run /etc/rc.d/rc.udev."
@@ -104,29 +104,21 @@ case "$1" in
)
else # udev is just now being started, so we'll do some initial setup:
- # Set STARTUP=1 in the environment
- /sbin/udevadm control --property=STARTUP=1
-
- # Set OPT="--action=add" to generate add events on coldplug
- OPT="--action=add"
-
- # Add the static nodes to $UDEV_ROOT:
- cp --preserve=all --recursive --remove-destination /lib/udev/devices/* $UDEV_ROOT
-
# Create rootdev rules
DEVICENUMBER=$( /bin/stat -c %d / )
MAJORNUMBER=$(($DEVICENUMBER / 256))
MINORNUMBER=$(($DEVICENUMBER % 256))
- echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules
+ echo 'ACTION!="remove", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules
+
+ # Set OPT="--action=add" to generate add events on coldplug
+ OPT="--action=add"
fi
echo "Triggering udev events: /sbin/udevadm trigger $OPT"
# Call udevtrigger and udevsettle to do the device configuration:
/sbin/udevadm trigger $OPT && /sbin/udevadm settle --timeout=120
- # Unset STARTUP=1 in the environment
- /sbin/udevadm control --property=STARTUP=
;;
stop)
diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules
index 29b6071e0..6883f5268 100644
--- a/source/a/udev/config/rules.d/40-slackware.rules
+++ b/source/a/udev/config/rules.d/40-slackware.rules
@@ -14,3 +14,6 @@
# input devices
KERNEL=="mice", SYMLINK+="mouse"
+# Set rfkill device writable by netdev group
+KERNEL=="rfkill", GROUP:="netdev", MODE:="0664"
+
diff --git a/source/a/udev/config/udev.conf b/source/a/udev/config/udev.conf
index b0421a08b..c8506e4b0 100644
--- a/source/a/udev/config/udev.conf
+++ b/source/a/udev/config/udev.conf
@@ -9,6 +9,6 @@ udev_root="/dev/"
# udev_log - The initial syslog(3) priority: "err", "info", "debug" or
# its numerical equivalent. For runtime debugging, the daemons
-# internal state can be changed with: udevcontrol log_priority=<value>
+# internal state can be changed with: udevadm control log_priority=<value>
udev_log="err"
diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh
index 5e737ca0c..5b7f5f902 100644
--- a/source/a/udev/doinst.sh
+++ b/source/a/udev/doinst.sh
@@ -37,3 +37,5 @@ config etc/modprobe.d/isapnp.conf.new
config etc/modprobe.d/psmouse.conf.new
config etc/modprobe.d/usb-controller.conf.new
+/sbin/udevadm info --convert-db 1>/dev/null 2>/dev/null
+
diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff
index f3f67516d..212c09f17 100644
--- a/source/a/udev/rule_generator.diff
+++ b/source/a/udev/rule_generator.diff
@@ -1,17 +1,17 @@
-diff -Naur udev.orig/extras/rule_generator/write_cd_rules udev/extras/rule_generator/write_cd_rules
---- udev.orig/extras/rule_generator/write_cd_rules 2009-05-19 00:24:39.000000000 -0300
-+++ udev/extras/rule_generator/write_cd_rules 2009-05-19 01:02:17.000000000 -0300
+diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/rule_generator/write_cd_rules
+--- udev-159.orig//extras/rule_generator/write_cd_rules 2010-06-25 04:37:36.000000000 -0500
++++ udev-159/extras/rule_generator/write_cd_rules 2010-07-07 02:44:14.501947041 -0500
@@ -3,7 +3,8 @@
# This script is run if an optical drive lacks a rule for persistent naming.
#
# It adds symlinks for optical drives based on the device class determined
-# by cdrom_id and used ID_PATH to identify the device.
-+# by cdrom_id and used ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION
-+# to identify the device.
- #
++# by cdrom_id and uses ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION to
++# identify the device.
+
# (C) 2006 Marco d'Itri <md@Linux.IT>
#
-@@ -96,18 +97,57 @@
+@@ -105,18 +106,57 @@
choose_rules_file
link_num=$(find_next_available 'cdrom[0-9]*')
diff --git a/source/a/udev/udev-153.tar.sign b/source/a/udev/udev-153.tar.sign
deleted file mode 100644
index 193f3a0e7..000000000
--- a/source/a/udev/udev-153.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLzqFNyGugalF9Dw4RApGYAKCVo2YvsfeOD/ozq/rsURNM/AoxrwCcCJl1
-YD0LnOVyqilDyMQdOk2VA7o=
-=hHbP
------END PGP SIGNATURE-----
diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild
index e891fca35..c6f83a0e4 100755
--- a/source/a/udev/udev.SlackBuild
+++ b/source/a/udev/udev.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -58,6 +58,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# So this is a major bug. At least, it triggers one in the kernel.
+# We'll revert it for now. If left in place, machines using ATA
+# (especially PATA) are liable to randomly crash on reboot.
+# The last little bit of this patch fails to reverse but it won't matter.
+if [ $VERSION = 165 ]; then
+ zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R
+fi
+
# Fixup the rule generator for our use
zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1
@@ -73,7 +81,7 @@ zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1
--disable-introspection \
--mandir=/usr/man \
--docdir=/usr/doc/udev-$VERSION \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@@ -106,6 +114,8 @@ find $PKG/etc -type d -exec chmod 755 {} \;
chmod 0755 $PKG/etc/rc.d/rc.udev.new
# Add extra device nodes to the package that udev doesn't make:
+# As of 156, some of these aren't be needed any more:
+# removed core@ fd@ stderr@ stdin@ stdout@
tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG
# Add various helper scripts:
@@ -113,18 +123,15 @@ for file in $CWD/config/scripts/* ; do
cp -a $file $PKG/lib/udev/
done
chown -R root:root $PKG/lib/udev
-chmod 755 $PKG/lib/udev/*
+chmod 0755 $PKG/lib/udev/*
# Move the pkgconfig file to where we expect it
mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
rmdir $PKG/usr/share/pkgconfig
-# Kill the ConsoleKit stuff
-rm -rf $PKG/usr/lib/ConsoleKit ; rmdir $PKG/usr/lib 2>/dev/null
-
mkdir -p $PKG/usr/doc/udev-$VERSION
cp -a \
- COPYING* README* TODO \
+ COPYING* README* TODO extras/keymap/README.keymap.txt \
$PKG/usr/doc/udev-$VERSION
# Don't package the API docs:
diff --git a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch
new file mode 100644
index 000000000..fc991b9af
--- /dev/null
+++ b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch
@@ -0,0 +1,305 @@
+From 560de575148b7efda3b34a7f7073abd483c5f08e Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Thu, 4 Nov 2010 08:55:58 -0400
+Subject: [PATCH 1/1] Use ata_id, not scsi_id, on ATAPI devices
+
+The major benefit here, is that we get the ATAPI device serial
+number. With SCSI ID we didn't get this since it's not part of the
+SCSI INQUIRY command. Specifically this means that we get symlinks to
+empty optical drives, e.g.
+
+ /dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376
+
+which we didn't get earlier. So this is a major win.
+
+Also make ata_id work on CD-ROM devices when using /dev/bsg nodes so
+this works on both the scsi_device as well as the block device. We do
+this, basically, by issuing the ATA IDENTIFY PACKET DEVICE command
+instead of the ATA IDENTIFY command. We also use 16-byte pass-through
+ATA passthrough instead of 12-byte passthrough to avoid clashing with
+the MMC BLANK command.
+
+This means that we get this output
+
+ # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: UDEV_LOG=3
+ E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: DEVTYPE=scsi_device
+ E: DRIVER=sr
+ E: MODALIAS=scsi:t-0x05
+ E: SUBSYSTEM=scsi
+ E: ID_ATA=1
+ E: ID_TYPE=cd
+ E: ID_BUS=ata
+ E: ID_MODEL=VBOX_CD-ROM
+ E: ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x 20\x20\x20\x20\x20\x20\x20
+ E: ID_REVISION=1.0
+ E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376
+ E: ID_SERIAL_SHORT=VB2-01700376
+
+instead of just
+
+ # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: UDEV_LOG=3
+ E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0
+ E: DEVTYPE=scsi_device
+ E: DRIVER=sr
+ E: MODALIAS=scsi:t-0x05
+ E: SUBSYSTEM=scsi
+ E: ID_SCSI=1
+ E: ID_VENDOR=VBOX
+ E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20
+ E: ID_MODEL=CD-ROM
+ E: ID_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20
+ E: ID_REVISION=1.0
+ E: ID_TYPE=cd
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ extras/ata_id/ata_id.c | 122 ++++++++++++++++++++++++++---
+ rules/rules.d/60-persistent-storage.rules | 4 +
+ 2 files changed, 114 insertions(+), 12 deletions(-)
+
+diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
+index 41544e9..92387e5 100644
+--- a/extras/ata_id/ata_id.c
++++ b/extras/ata_id/ata_id.c
+@@ -202,6 +202,89 @@ static int disk_identify_command(int fd,
+ return ret;
+ }
+
++static int disk_identify_packet_device_command(int fd,
++ void *buf,
++ size_t buf_len)
++{
++ struct sg_io_v4 io_v4;
++ uint8_t cdb[16];
++ uint8_t sense[32];
++ uint8_t *desc = sense+8;
++ int ret;
++
++ /*
++ * ATA Pass-Through 16 byte command, as described in
++ *
++ * T10 04-262r8 ATA Command Pass-Through
++ *
++ * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
++ */
++ memset(cdb, 0, sizeof(cdb));
++ cdb[0] = 0x85; /* OPERATION CODE: 16 byte pass through */
++ cdb[1] = 4 << 1; /* PROTOCOL: PIO Data-in */
++ cdb[2] = 0x2e; /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
++ cdb[3] = 0; /* FEATURES */
++ cdb[4] = 0; /* FEATURES */
++ cdb[5] = 0; /* SECTORS */
++ cdb[6] = 1; /* SECTORS */
++ cdb[7] = 0; /* LBA LOW */
++ cdb[8] = 0; /* LBA LOW */
++ cdb[9] = 0; /* LBA MID */
++ cdb[10] = 0; /* LBA MID */
++ cdb[11] = 0; /* LBA HIGH */
++ cdb[12] = 0; /* LBA HIGH */
++ cdb[13] = 0; /* DEVICE */
++ cdb[14] = 0xA1; /* Command: ATA IDENTIFY PACKET DEVICE */;
++ cdb[15] = 0; /* CONTROL */
++ memset(sense, 0, sizeof(sense));
++
++ memset(&io_v4, 0, sizeof(struct sg_io_v4));
++ io_v4.guard = 'Q';
++ io_v4.protocol = BSG_PROTOCOL_SCSI;
++ io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
++ io_v4.request_len = sizeof (cdb);
++ io_v4.request = (uintptr_t) cdb;
++ io_v4.max_response_len = sizeof (sense);
++ io_v4.response = (uintptr_t) sense;
++ io_v4.din_xfer_len = buf_len;
++ io_v4.din_xferp = (uintptr_t) buf;
++ io_v4.timeout = COMMAND_TIMEOUT_MSEC;
++
++ ret = ioctl(fd, SG_IO, &io_v4);
++ if (ret != 0) {
++ /* could be that the driver doesn't do version 4, try version 3 */
++ if (errno == EINVAL) {
++ struct sg_io_hdr io_hdr;
++
++ memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
++ io_hdr.interface_id = 'S';
++ io_hdr.cmdp = (unsigned char*) cdb;
++ io_hdr.cmd_len = sizeof (cdb);
++ io_hdr.dxferp = buf;
++ io_hdr.dxfer_len = buf_len;
++ io_hdr.sbp = sense;
++ io_hdr.mx_sb_len = sizeof (sense);
++ io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
++ io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
++
++ ret = ioctl(fd, SG_IO, &io_hdr);
++ if (ret != 0)
++ goto out;
++ } else {
++ goto out;
++ }
++ }
++
++ if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
++ errno = EIO;
++ ret = -1;
++ goto out;
++ }
++
++ out:
++ return ret;
++}
++
+ /**
+ * disk_identify_get_string:
+ * @identify: A block of IDENTIFY data
+@@ -256,31 +339,36 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs
+ * @udev: The libudev context.
+ * @fd: File descriptor for the block device.
+ * @out_identify: Return location for IDENTIFY data.
++ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE.
+ *
+- * Sends the IDENTIFY DEVICE command to the device represented by
+- * @fd. If successful, then the result will be copied into
+- * @out_identify.
++ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the
++ * device represented by @fd. If successful, then the result will be
++ * copied into @out_identify and @out_is_packet_device.
+ *
+ * This routine is based on code from libatasmart, Copyright 2008
+ * Lennart Poettering, LGPL v2.1.
+ *
+- * Returns: 0 if the IDENTIFY data was successfully obtained,
+- * otherwise non-zero with errno set.
++ * Returns: 0 if the data was successfully obtained, otherwise
++ * non-zero with errno set.
+ */
+ static int disk_identify (struct udev *udev,
+ int fd,
+- uint8_t out_identify[512])
++ uint8_t out_identify[512],
++ int *out_is_packet_device)
+ {
+ int ret;
+ uint8_t inquiry_buf[36];
+ int peripheral_device_type;
+ int all_nul_bytes;
+ int n;
++ int is_packet_device;
+
+ assert (out_identify != NULL);
++
+ /* init results */
+ ret = -1;
+ memset (out_identify, '\0', 512);
++ is_packet_device = 0;
+
+ /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
+ * we could accidentally blank media. This is because MMC's BLANK
+@@ -309,6 +397,12 @@ static int disk_identify (struct udev *udev,
+
+ /* SPC-4, section 6.4.2: Standard INQUIRY data */
+ peripheral_device_type = inquiry_buf[0] & 0x1f;
++ if (peripheral_device_type == 0x05)
++ {
++ is_packet_device = 1;
++ ret = disk_identify_packet_device_command(fd, out_identify, 512);
++ goto check_nul_bytes;
++ }
+ if (peripheral_device_type != 0x00) {
+ ret = -1;
+ errno = EIO;
+@@ -320,6 +414,7 @@ static int disk_identify (struct udev *udev,
+ if (ret != 0)
+ goto out;
+
++ check_nul_bytes:
+ /* Check if IDENTIFY data is all NUL bytes - if so, bail */
+ all_nul_bytes = 1;
+ for (n = 0; n < 512; n++) {
+@@ -336,6 +431,8 @@ static int disk_identify (struct udev *udev,
+ }
+
+ out:
++ if (out_is_packet_device != NULL)
++ *out_is_packet_device = is_packet_device;
+ return ret;
+ }
+
+@@ -350,7 +447,7 @@ int main(int argc, char *argv[])
+ {
+ struct udev *udev;
+ struct hd_driveid id;
+- uint8_t identify[512];
++ uint8_t identify[512];
+ char model[41];
+ char model_enc[256];
+ char serial[21];
+@@ -358,8 +455,9 @@ int main(int argc, char *argv[])
+ const char *node = NULL;
+ int export = 0;
+ int fd;
+- uint16_t word;
++ uint16_t word;
+ int rc = 0;
++ int is_packet_device = 0;
+ static const struct option options[] = {
+ { "export", no_argument, NULL, 'x' },
+ { "help", no_argument, NULL, 'h' },
+@@ -408,7 +506,7 @@ int main(int argc, char *argv[])
+ goto exit;
+ }
+
+- if (disk_identify(udev, fd, identify) == 0) {
++ if (disk_identify(udev, fd, identify, &is_packet_device) == 0) {
+ /*
+ * fix up only the fields from the IDENTIFY data that we are going to
+ * use and copy it into the hd_driveid struct for convenience
+@@ -416,7 +514,7 @@ int main(int argc, char *argv[])
+ disk_identify_fixup_string (identify, 10, 20); /* serial */
+ disk_identify_fixup_string (identify, 23, 6); /* fwrev */
+ disk_identify_fixup_string (identify, 27, 40); /* model */
+- disk_identify_fixup_uint16 (identify, 0); /* configuration */
++ disk_identify_fixup_uint16 (identify, 0); /* configuration */
+ disk_identify_fixup_uint16 (identify, 75); /* queue depth */
+ disk_identify_fixup_uint16 (identify, 75); /* SATA capabilities */
+ disk_identify_fixup_uint16 (identify, 82); /* command set supported */
+@@ -457,8 +555,8 @@ int main(int argc, char *argv[])
+ udev_util_replace_chars(revision, NULL);
+
+ if (export) {
+- /* Set this to convey the disk speaks the ATA protocol */
+- printf("ID_ATA=1\n");
++ /* Set this to convey the disk speaks the ATA protocol */
++ printf("ID_ATA=1\n");
+
+ if ((id.config >> 8) & 0x80) {
+ /* This is an ATAPI device */
+diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
+index d3f2f73..8baabc2 100644
+--- a/rules/rules.d/60-persistent-storage.rules
++++ b/rules/rules.d/60-persistent-storage.rules
+@@ -12,6 +12,8 @@ ACTION=="remove", GOTO="persistent_storage_end"
+
+ # run scsi_id and ata_id on the actual SCSI device
+ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel"
++# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA
++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel"
+ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel"
+
+ # from this point on, only care about block devices
+@@ -40,6 +42,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode"
+ # ATA devices using the "scsi" subsystem
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode"
++# ATA/ATAPI devices using the "scsi" subsystem
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", IMPORT{program}="ata_id --export $tempnode"
+ # scsi devices
+ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi"
+ KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss"
+--
+1.7.3.4
+
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-30 23:01:01 +0000