X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fpath_id%2Fpath_id;h=f7b1435d3d7a0b8ce27c17130dc14951e9089fd7;hp=7a37700289d89841a0d54367835592e4e50a48e4;hb=c3f0b654fc18b5f98bc65074e2118177e0f37ae9;hpb=1d918b50cddc975abbfd06af134a6d843d9bc7f0

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index 7a3770028..f7b1435d3 100755
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -95,7 +95,11 @@ handle_pci () {
 				;;
 		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
 }
@@ -250,7 +254,7 @@ handle_fc () {
 	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