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: fix fibre channel handling
[elogind.git]
/
extras
/
path_id
/
path_id
diff --git
a/extras/path_id/path_id
b/extras/path_id/path_id
index 7a37700289d89841a0d54367835592e4e50a48e4..f7b1435d3d7a0b8ce27c17130dc14951e9089fd7 100755
(executable)
--- a/
extras/path_id/path_id
+++ b/
extras/path_id/path_id
@@
-95,7
+95,11
@@
handle_pci () {
;;
esac
done
;;
esac
done
- d="pci-$pci_id-$d"
+ if [ "$d" ]; then
+ d="pci-$pci_id-$d"
+ else
+ d="pci-$pci_id"
+ fi
D="$host_dev_path"
RESULT=0
}
D="$host_dev_path"
RESULT=0
}
@@
-250,7
+254,7
@@
handle_fc () {
fc_tgt_lun="${fc_tgt_hcil##*:}"
fc_tgt_path="${DEV%/*}"
fc_tgt_num="${fc_tgt_path##*/}"
fc_tgt_lun="${fc_tgt_hcil##*:}"
fc_tgt_path="${DEV%/*}"
fc_tgt_num="${fc_tgt_path##*/}"
- fc_tgt_dev="${fc_tgt_path}/fc_transport
:
${fc_tgt_num}"
+ fc_tgt_dev="${fc_tgt_path}/fc_transport
/
${fc_tgt_num}"
if [ -e "$fc_tgt_dev/port_name" ]; then
read wwpn < $fc_tgt_dev/port_name
fi
if [ -e "$fc_tgt_dev/port_name" ]; then
read wwpn < $fc_tgt_dev/port_name
fi