Merge branch 'master' of github.com:45Drives/tools

45Drives · Jan 10, 2025 · 8b9f655 · 8b9f655
2 parents d9675fb + ac4ff8c
commit 8b9f655
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,3 @@
-## 45drives-tools 3.0.14-1
+## 45drives-tools 3.0.15-1
 
-* Adds support for HL4/8 and 45Professional
-* Fixes sata addressing for HL4/8
+* reverse mapping order pro4/pro8
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
     "name": "45drives-tools",
     "title": "45drives-tools",
     "prerelease": false,
-    "version": "3.0.14",
+    "version": "3.0.15",
     "buildVersion": "1",
     "author": "Brett Kelly <[email protected]>",
     "url": "https://github.com/45Drives/tools",
@@ -65,7 +65,7 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "3.0.14",
+        "version": "3.0.15",
         "buildVersion": "1",
         "ignore": [],
         "date": null,

diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec
@@ -58,6 +58,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Tue Jan 07 2025 Brett Kelly <[email protected]> 3.0.15-1
+- reverse mapping order pro4/pro8
 * Mon Dec 16 2024 Jordan Keough <[email protected]> 3.0.14-1
 - Adds support for HL4/8 and 45Professional
 - Fixes sata addressing for HL4/8

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -63,6 +63,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Tue Jan 07 2025 Brett Kelly <[email protected]> 3.0.15-1
+- reverse mapping order pro4/pro8
 * Mon Dec 16 2024 Jordan Keough <[email protected]> 3.0.14-1
 - Adds support for HL4/8 and 45Professional
 - Fixes sata addressing for HL4/8

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+45drives-tools (3.0.15-1focal) focal; urgency=medium
+
+  * reverse mapping order pro4/pro8
+
+ -- Brett Kelly <[email protected]>  Tue, 07 Jan 2025 08:16:07 -0400
+
 45drives-tools (3.0.14-1focal) focal; urgency=medium
 
   * Adds support for HL4/8 and 45Professional

diff --git a/tools/dmap b/tools/dmap
@@ -799,7 +799,7 @@ def alias_hl8():
 ###############################################################################
 def alias_pro4():
 	vdev_id_str = ""
-	pro4_order = [1,2,3,4]
+	pro4_order = [4,3,2,1]
 
 	for i in range(0,len(pro4_order)):
 		vdev_id_str += (
@@ -818,8 +818,8 @@ def alias_pro4():
 ###############################################################################
 def alias_pro8():
 	vdev_id_str = ""
-	pro8_order1 = [1,2,3,4]
-	pro8_order2 = [5,6,7,8]
+	pro8_order1 = [4,3,2,1]
+	pro8_order2 = [8,7,6,5]
 
 	for i in range(0,len(pro8_order1)):
 		vdev_id_str += (