chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path_id: remove subsystem whitelist
[elogind.git]
/
extras
/
path_id
/
path_id
diff --git
a/extras/path_id/path_id
b/extras/path_id/path_id
old mode 100644
(file)
new mode 100755
(executable)
index
825c77c
..
7a37700
--- a/
extras/path_id/path_id
+++ b/
extras/path_id/path_id
@@
-10,13
+10,6
@@
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation version 2 of the License.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation version 2 of the License.
-#
-# to be called from a udev rule to return the name for a symlink
-# DEVPATH=<devpath>; path_id
-# path_id <devpath>
-
-# examples for all block devices on a system:
-# for i in `find /sys/class/block`; do DEVPATH="`echo $i | sed -e 's@^/sys\|/dev@@g'`"; path_id; done
SYSFS=/sys
RESULT=1
SYSFS=/sys
RESULT=1
@@
-81,6
+74,17
@@
handle_pci () {
DEV=${PWD}
pci_id=${DEV##*/}
host_dev_path=$DEV
DEV=${PWD}
pci_id=${DEV##*/}
host_dev_path=$DEV
+
+ # cciss devices don't have a separate sysfs node
+ for blk_link in block*; do
+ if [ -L "$blk_link" ]; then
+ case "$blk_link" in
+ *cciss*)
+ d=cciss-${blk_link#*cciss\!}
+ ;;
+ esac
+ fi
+ done
while [ ! -z "$host_dev_path" ] ; do
case "$host_dev_path" in
*/pci[0-9]*)
while [ ! -z "$host_dev_path" ] ; do
case "$host_dev_path" in
*/pci[0-9]*)
@@
-220,7
+224,7
@@
handle_scsi () {
}
handle_firewire () {
}
handle_firewire () {
- :handle_firewire $*
+ :
handle_firewire $*
local DEV=$1
if [ -f "$D/ieee1394_id" ] ; then
read ieee1394_id < $D/ieee1394_id
local DEV=$1
if [ -f "$D/ieee1394_id" ] ; then
read ieee1394_id < $D/ieee1394_id
@@
-278,15
+282,17
@@
handle_sas () {
local DEV=$1
local cil adapter controller_dev
# SAS device
local DEV=$1
local cil adapter controller_dev
# SAS device
- sas_host_path="${DEV%%/p
hy
*}"
+ sas_host_path="${DEV%%/p
ort
*}"
sas_phy_path="${DEV#*/host*/}"
sas_phy_path="${sas_phy_path%%/target*}"
sas_phy_id="${sas_phy_path%%/*}"
sas_phy_path="${DEV#*/host*/}"
sas_phy_path="${sas_phy_path%%/target*}"
sas_phy_id="${sas_phy_path%%/*}"
- sas_rphy_id="${sas_phy_path##*/}"
- sas_phy_dev="/sys/class/sas_phy/${sas_phy_id}"
+ sas_phy_id="${sas_phy_id##*port-}"
+ sas_port_id="${sas_phy_path%%/end_device*}"
+ sas_port_id="${sas_port_id##*port-}"
+ sas_end_id="${sas_phy_path##*end_device-}"
+ sas_phy_dev="/sys/class/sas_phy/phy-${sas_phy_id}"
if [ -e "$sas_phy_dev/sas_address" ]; then
read phy_address < $sas_phy_dev/sas_address
if [ -e "$sas_phy_dev/sas_address" ]; then
read phy_address < $sas_phy_dev/sas_address
- read phy_port < $sas_phy_dev/port_identifier
read phy_id < $sas_phy_dev/phy_identifier
fi
if [ -z "$phy_address" ] ; then
read phy_id < $sas_phy_dev/phy_identifier
fi
if [ -z "$phy_address" ] ; then
@@
-295,22
+301,32
@@
handle_sas () {
RESULT=1
return
fi
RESULT=1
return
fi
+ sas_port_dev="/sys/class/sas_port/port-${sas_port_id}"
+ if [ -e "$sas_port_dev/num_phys" ] ; then
+ read phy_port < $sas_port_dev/num_phys
+ fi
+ if [ -z "$phy_port" ] ; then
+ : no initiator address
+ D=
+ RESULT=1
+ return
+ fi
sas_phy_address="$phy_address:$phy_port:$phy_id"
sas_phy_address="$phy_address:$phy_port:$phy_id"
- sas_
rphy_dev="/sys/class/sas_device/${sas_rphy
_id}"
- if [ -e "$sas_
rphy
_dev/sas_address" ]; then
- read
rphy_address < $sas_rphy
_dev/sas_address
- read
rphy_id < $sas_rphy
_dev/phy_identifier
+ sas_
end_dev="/sys/class/sas_device/end_device-${sas_end
_id}"
+ if [ -e "$sas_
end
_dev/sas_address" ]; then
+ read
end_address < $sas_end
_dev/sas_address
+ read
end_id < $sas_end
_dev/phy_identifier
fi
fi
- if [ -z "$
rphy
_address" ] ; then
+ if [ -z "$
end
_address" ] ; then
: no initiator address
D=
RESULT=1
return
fi
: no initiator address
D=
RESULT=1
return
fi
- sas_
rphy_address="$rphy_address:$rphy
_id"
+ sas_
end_address="$end_address:$end
_id"
controller_dev="${sas_host_path%/host[0-9]*}"
# SAS devices are always endpoints
controller_dev="${sas_host_path%/host[0-9]*}"
# SAS devices are always endpoints
- d="sas-${sas_phy_address}-${sas_
rphy
_address}"
+ d="sas-${sas_phy_address}-${sas_
end
_address}"
D="$controller_dev"
RESULT=0
}
D="$controller_dev"
RESULT=0
}
@@
-320,6
+336,7
@@
handle_iscsi() {
local iscsi_session_dir
local iscsi_session iscsi_session_path
local iscsi_connection iscsi_connection_path
local iscsi_session_dir
local iscsi_session iscsi_session_path
local iscsi_connection iscsi_connection_path
+ local iscsi_scsi_lun
# iSCSI device
iscsi_session_dir="${DEV%%/target*}"
iscsi_session="${iscsi_session_dir##*/}"
# iSCSI device
iscsi_session_dir="${DEV%%/target*}"
iscsi_session="${iscsi_session_dir##*/}"
@@
-366,7
+383,8
@@
handle_iscsi() {
if [ -e "${iscsi_connection_path}/persistent_port" ] ; then
read iscsi_port < ${iscsi_connection_path}/persistent_port
fi
if [ -e "${iscsi_connection_path}/persistent_port" ] ; then
read iscsi_port < ${iscsi_connection_path}/persistent_port
fi
- d="ip-${iscsi_address}:${iscsi_port}-iscsi-${iscsi_tgtname}"
+ iscsi_scsi_lun="${DEV##*:}"
+ d="ip-${iscsi_address}:${iscsi_port}-iscsi-${iscsi_tgtname}-lun-${iscsi_scsi_lun}"
RESULT=0
}
RESULT=0
}
@@
-409,35
+427,45
@@
handle_device () {
full_sysfs_path="$SYSFS$DEVPATH"
case "$DEVPATH" in
/devices/*)
full_sysfs_path="$SYSFS$DEVPATH"
case "$DEVPATH" in
/devices/*)
- # new sysfs layout
+ full_sysfs_path="${full_sysfs_path%/*}"
+ # skip parent device of the same subsystem
if [ -L $full_sysfs_path/subsystem ]; then
if [ -L $full_sysfs_path/subsystem ]; then
- full_sysfs_path="${full_sysfs_path%/*}"
cd "$full_sysfs_path/subsystem";
subsys="`pwd -P`"
cd "$OPWD"
subsys="${subsys##*/}"
cd "$full_sysfs_path/subsystem";
subsys="`pwd -P`"
cd "$OPWD"
subsys="${subsys##*/}"
- if [ "$subsys" = "
block
" ]; then
- # parent is "block", it's a partition, move one up
- full_sysfs_path="${full_sysfs_path%/*}"
+ if [ "$subsys" = "
$TYPE
" ]; then
+ : skip same subsystem parent
+
full_sysfs_path="${full_sysfs_path%/*}"
fi
fi
- cd $full_sysfs_path
fi
fi
+ # skip subsystem directory
+ subsys="${full_sysfs_path##*/}"
+ if [ "$subsys" = "$TYPE" ]; then
+ : skip subsystem directory
+ full_sysfs_path="${full_sysfs_path%/*}"
+ fi
+ cd $full_sysfs_path
;;
*)
# old sysfs layout
;;
*)
# old sysfs layout
- if [ ! -L $full_sysfs_path/device ] ; then
- if [ -f $full_sysfs_path/range ] ; then return ; fi
+ if [ ! -L $full_sysfs_path/device ]; then
full_sysfs_path="${full_sysfs_path%/*}"
: full_sysfs_path "$full_sysfs_path"
full_sysfs_path="${full_sysfs_path%/*}"
: full_sysfs_path "$full_sysfs_path"
- if [ ! -L $full_sysfs_path/device -o ! -f $full_sysfs_path/dev ]
; then
+ if [ ! -L $full_sysfs_path/device -o ! -f $full_sysfs_path/dev ]; then
return
fi
fi
return
fi
fi
- cd $full_sysfs_path/device
+ if [ -L $full_sysfs_path/device/device ]; then
+ cd $full_sysfs_path/device/device
+ else
+ cd $full_sysfs_path/device
+ fi
;;
esac
full_sysfs_device_path="`pwd -P`"
cd "$OPWD"
;;
esac
full_sysfs_device_path="`pwd -P`"
cd "$OPWD"
+
D=$full_sysfs_device_path
while [ ! -z "$D" ] ; do
case "$D" in
D=$full_sysfs_device_path
while [ ! -z "$D" ] ; do
case "$D" in
@@
-470,7
+498,7
@@
handle_device () {
*/rport-[0-9]*:[0-9]*-[0-9]*/*)
handle_fc "$D"
;;
*/rport-[0-9]*:[0-9]*-[0-9]*/*)
handle_fc "$D"
;;
- */
phy-
[0-9]*:[0-9]*/*)
+ */
end_device-[0-9]*:
[0-9]*:[0-9]*/*)
handle_sas "$D"
;;
*/fw-host[0-9]*/*)
handle_sas "$D"
;;
*/fw-host[0-9]*/*)
@@
-521,7
+549,7
@@
handle_device () {
;;
*)
mode=""
;;
*)
mode=""
- ;;
+
;;
esac
if [ "$d" ]; then
d="$d-${rewind}st${mode}"
esac
if [ "$d" ]; then
d="$d-${rewind}st${mode}"
@@
-529,22
+557,9
@@
handle_device () {
fi
}
fi
}
-case "$TYPE" in
- block)
- handle_device
- echo "ID_PATH=$d"
- ;;
- scsi_tape)
- handle_device
- echo "ID_PATH=$d"
- ;;
- input)
- handle_device
- echo "ID_PATH=$d"
- ;;
- *)
- RESULT=1
- ;;
-esac
-
-exit $RESULT
+handle_device
+if [ -z "$d" ]; then
+ exit 1
+fi
+echo "ID_PATH=$d"
+exit 0