Merge pull request #47 from 45Drives/ubm-action-dmap-fix

JordanKeo45 · web-flow · commit cf83d30afeff · 2026-01-05T12:45:49.000-04:00
Ubm action dmap fix (patch_vdev_id_conf will now run when either udev 'add' or 'change' actions are triggered, not just 'add')
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 45drives-tools 4.0.30-1
+## 45drives-tools 4.0.32-1
 
-* Fix udev rule issues affecting /etc/vdev_id.conf
+* Hotfix - reverses hl4 slot order
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
     "name": "45drives-tools",
     "title": "45drives-tools",
     "description": "cli tools for 45Drives server products",
-    "version": "4.0.30",
+    "version": "4.0.32",
     "build_number": "1",
     "stable": true,
     "author": "Brett Kelly <bkelly@45drives.com>",
@@ -75,10 +75,10 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "4.0.30",
+        "version": "4.0.32",
         "build_number": "1",
         "date": null,
         "packager": "Brett Kelly <bkelly@45drives.com>",
         "changes": []
     }
-}
+}
diff --git a/packaging/debian-bookworm/changelog b/packaging/debian-bookworm/changelog
@@ -1,3 +1,15 @@
+45drives-tools (4.0.32-1bookworm) bookworm; urgency=medium
+
+  * Hotfix - reverses hl4 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 19 Dec 2025 04:18:58 -0400
+
+45drives-tools (4.0.31-1bookworm) bookworm; urgency=medium
+
+  * Updates dmap with proper HL8 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 17 Dec 2025 10:19:47 -0400
+
 45drives-tools (4.0.30-1bookworm) bookworm; urgency=medium
 
   * Fix udev rule issues affecting /etc/vdev_id.conf
diff --git a/packaging/rocky-el8/main.spec.j2 b/packaging/rocky-el8/main.spec.j2
@@ -77,6 +77,10 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Fri Dec 19 2025 Jordan Keough <jkeough@45drives.com> 4.0.32-1
+- Hotfix - reverses hl4 slot order
+* Wed Dec 17 2025 Jordan Keough <jkeough@45drives.com> 4.0.31-1
+- Updates dmap with proper HL8 slot order
 * Wed Nov 26 2025 Joshua Boudreau <jboudreau@45drives.com> 4.0.30-1
 - Fix udev rule issues affecting /etc/vdev_id.conf
 * Tue Nov 25 2025 Joshua Boudreau <jboudreau@45drives.com> 4.0.29-1
diff --git a/packaging/rocky-el9/main.spec.j2 b/packaging/rocky-el9/main.spec.j2
@@ -77,6 +77,10 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Fri Dec 19 2025 Jordan Keough <jkeough@45drives.com> 4.0.32-1
+- Hotfix - reverses hl4 slot order
+* Wed Dec 17 2025 Jordan Keough <jkeough@45drives.com> 4.0.31-1
+- Updates dmap with proper HL8 slot order
 * Wed Nov 26 2025 Joshua Boudreau <jboudreau@45drives.com> 4.0.30-1
 - Fix udev rule issues affecting /etc/vdev_id.conf
 * Tue Nov 25 2025 Joshua Boudreau <jboudreau@45drives.com> 4.0.29-1
diff --git a/packaging/ubuntu-focal/changelog b/packaging/ubuntu-focal/changelog
@@ -1,3 +1,15 @@
+45drives-tools (4.0.32-1focal) focal; urgency=medium
+
+  * Hotfix - reverses hl4 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 19 Dec 2025 04:18:58 -0400
+
+45drives-tools (4.0.31-1focal) focal; urgency=medium
+
+  * Updates dmap with proper HL8 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 17 Dec 2025 10:19:47 -0400
+
 45drives-tools (4.0.30-1focal) focal; urgency=medium
 
   * Fix udev rule issues affecting /etc/vdev_id.conf
diff --git a/packaging/ubuntu-jammy/changelog b/packaging/ubuntu-jammy/changelog
@@ -1,3 +1,15 @@
+45drives-tools (4.0.32-1jammy) jammy; urgency=medium
+
+  * Hotfix - reverses hl4 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 19 Dec 2025 04:18:58 -0400
+
+45drives-tools (4.0.31-1jammy) jammy; urgency=medium
+
+  * Updates dmap with proper HL8 slot order
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 17 Dec 2025 10:19:47 -0400
+
 45drives-tools (4.0.30-1jammy) jammy; urgency=medium
 
   * Fix udev rule issues affecting /etc/vdev_id.conf
diff --git a/tools/dmap b/tools/dmap
@@ -840,7 +840,7 @@ def get_sata_pci_addresses():
 ###############################################################################
 def alias_hl4():
     vdev_id_str = ""
-    hl4_order = [1, 2, 3, 4]
+    hl4_order = [4, 3, 2, 1]
 
     # Fetch SATA addresses dynamically
     sata_addresses = get_sata_pci_addresses()
diff --git a/tools/server_identifier b/tools/server_identifier
@@ -23,7 +23,7 @@ g_product_lut_idx = {
 	"ALIAS_STYLE":	4
 }
 
-g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15","STUDIO8","HL15_BEAST","VM2"]
+g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15","STUDIO8","HL15_BEAST","F16","VM2"]
 
 g_mobo_to_version_lut = {
 	"Base": ["X11SSH-CTF","X11SSM-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC","ROMED8-2T/BCM","ROMED8-2T", "ProArt X870E-CREATOR WIFI"],
@@ -267,8 +267,10 @@ g_product_lut = {
 	"Destroyinator-XL60-Enhanced":		[g_mobo_to_version_lut["Enhanced"]  ,0,4,"XL60","DESTROYINATOR"],
 	"Destroyinator-XL60-Enhanced-S":	[g_mobo_to_version_lut["Enhanced-S"]  ,0,4,"XL60","DESTROYINATOR"],
 
-	"Destroyinator-F16-Enhanced":		[g_mobo_to_version_lut["Enhanced"],0,4,"F16","F2STORNADO"],
+ 	"Destroyinator-F16-Enhanced":		[g_mobo_to_version_lut["Enhanced"],0,4,"F16","F2STORNADO"],
 	"Destroyinator-F16-Enhanced-S":		[g_mobo_to_version_lut["Enhanced-S"],0,4,"F16","F2STORNADO"],
+	"Destroyinator-F16-Turbo":			[g_mobo_to_version_lut["Turbo"],0,4,"F16","F2STORNADO"],
+	"Destroyinator-F16-Turbo-G":		[g_mobo_to_version_lut["Turbo-G"],0,4,"F16","F2STORNADO"],
  
 	"Studio-STUDIO8":             		[g_mobo_to_version_lut["Turbo"],0,0,"STUDIO8","STUDIO"],
 
diff --git a/udev/67-ubm.rules b/udev/67-ubm.rules
@@ -17,7 +17,7 @@ SUBSYSTEMS=="scsi", DRIVERS=="sd", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk|parti
 SUBSYSTEMS=="scsi", DRIVERS=="sd", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk|partition", IMPORT{program}="/opt/45drives/ubm/id_disk %k"
 
 # DISK_HANDLED_BY_UBM environment variable will make udev skip rules in 68-vdev.rules
-ACTION=="add", ENV{SUBSYSTEM}=="block", ENV{SLOT_NUM}=="?*", ENV{SLOT_NAME}=="?*", ENV{DISK_HANDLED_BY_UBM}="1"
+ACTION=="add|change", ENV{SUBSYSTEM}=="block", ENV{SLOT_NUM}=="?*", ENV{SLOT_NAME}=="?*", ENV{DISK_HANDLED_BY_UBM}="1"
 
 KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{SLOT_NAME}=="?*", SYMLINK+="disk/by-vdev/$env{SLOT_NAME}", SYMLINK+="$env{SLOT_NAME}"
 KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{SLOT_NUM}=="?*", SYMLINK+="disk/by-slot-number/$env{SLOT_NUM}"
diff --git a/udev/68-0-custom-aliases.rules b/udev/68-0-custom-aliases.rules
@@ -11,7 +11,7 @@
 SUBSYSTEMS=="pci", DRIVERS=="nvme", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk|partition", IMPORT{program}="/opt/45drives/tools/id_disk_custom_alias %p"
 
 # skip running vdev_id
-ACTION=="add", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", ENV{ID_VDEV_PATH}=="?*", ENV{ID_VDEV_ALT_PATH}=="?*", ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}="1"
+ACTION=="add|change", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", ENV{ID_VDEV_PATH}=="?*", ENV{ID_VDEV_ALT_PATH}=="?*", ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}="1"
 
 ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}=="1", KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", ENV{ID_VDEV}=="?*", RUN+="/opt/45drives/ubm/patch_vdev_id_conf $env{ID_VDEV} $env{ID_PATH}"
 
