aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Hutter <[email protected]>2021-10-29 15:33:34 -0700
committerGitHub <[email protected]>2021-10-29 15:33:34 -0700
commit4d4998ea39a21e070e2c8dc7f5d2a33d3e6760f4 (patch)
tree9b0ee0b35171d5ce368f32ba6b8c9d3c3551d4e1
parentd5a5ec46934c00d1c2e59ece2a32aad1ba9c982e (diff)
vdev_id: Fix PHY sorting
One of our developers noticed a bug in vdev_id where we were incorrectly sorting PHYs using alphabetical sorting (which usually works) instead of natural sorting (-v). For example: [port-0:0]# ls -d phy* phy-0:10 phy-0:11 phy-0:8 phy-0:9 [port-0:0]# ls -vd phy* phy-0:8 phy-0:9 phy-0:10 phy-0:11 This fixes the issue. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes #12699
-rwxr-xr-xcmd/vdev_id/vdev_id2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/vdev_id/vdev_id b/cmd/vdev_id/vdev_id
index ab9d7326f..8cc4399a5 100755
--- a/cmd/vdev_id/vdev_id
+++ b/cmd/vdev_id/vdev_id
@@ -375,7 +375,7 @@ sas_handler() {
i=$((i + 1))
done
- PHY=$(ls -d "$port_dir"/phy* 2>/dev/null | head -1 | awk -F: '{print $NF}')
+ PHY=$(ls -vd "$port_dir"/phy* 2>/dev/null | head -1 | awk -F: '{print $NF}')
if [ -z "$PHY" ] ; then
PHY=0
fi