From 5de17e50ab7d2bdbf216ff1842049e51050baf7e Mon Sep 17 00:00:00 2001 From: markdhooper Date: Wed, 4 Jan 2023 12:46:05 -0400 Subject: [PATCH] updated how F8X servers are aliased and updated manifest for prerelease build --- CHANGELOG.md | 4 ++-- manifest.json | 10 +++++----- packaging/el7/main.spec | 2 ++ packaging/el8/main.spec | 2 ++ packaging/focal/changelog | 6 ++++++ src/fakeroot/opt/45drives/tools/dmap | 4 ++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5accf5..d453375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## 45drives-tools 2.1.0-4 +## 45drives-tools 2.1.1-1 -* added support for 9400-16i HBA cards \ No newline at end of file +* updated how F8X servers are aliased in dmap \ No newline at end of file diff --git a/manifest.json b/manifest.json index 822bd20..618564f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,9 +2,9 @@ "__version": "45D-R1", "name": "45drives-tools", "title": "45drives-tools", - "prerelease": false, - "version": "2.1.0", - "buildVersion": "4", + "prerelease": true, + "version": "2.1.1", + "buildVersion": "1", "author": "Mark Hooper ", "url": "https://github.com/45Drives/tools", "category": "utils", @@ -62,8 +62,8 @@ ], "changelog": { "urgency": "medium", - "version": "2.1.0", - "buildVersion": "4", + "version": "2.1.1", + "buildVersion": "1", "ignore": [], "date": null, "packager": "Mark Hooper ", diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec index 654a456..c50851b 100644 --- a/packaging/el7/main.spec +++ b/packaging/el7/main.spec @@ -55,6 +55,8 @@ fi %{_bindir}/* %changelog +* Wed Jan 04 2023 Mark Hooper 2.1.1-1 +- updated how F8X servers are aliased in dmap * Mon Oct 31 2022 Mark Hooper 2.1.0-4 - added support for 9400-16i HBA cards * Wed Sep 14 2022 Mark Hooper 2.1.0-3 diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 431b04f..bc3c72b 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -55,6 +55,8 @@ fi %{_bindir}/* %changelog +* Wed Jan 04 2023 Mark Hooper 2.1.1-1 +- updated how F8X servers are aliased in dmap * Mon Oct 31 2022 Mark Hooper 2.1.0-4 - added support for 9400-16i HBA cards * Wed Sep 14 2022 Mark Hooper 2.1.0-3 diff --git a/packaging/focal/changelog b/packaging/focal/changelog index 068bcc4..c1bd1a5 100644 --- a/packaging/focal/changelog +++ b/packaging/focal/changelog @@ -1,3 +1,9 @@ +45drives-tools (2.1.1-1focal) focal; urgency=medium + + * updated how F8X servers are aliased in dmap + + -- Mark Hooper Wed, 04 Jan 2023 08:45:15 -0400 + 45drives-tools (2.1.0-4focal) focal; urgency=medium * added support for 9400-16i HBA cards diff --git a/src/fakeroot/opt/45drives/tools/dmap b/src/fakeroot/opt/45drives/tools/dmap index e252d10..968ef18 100755 --- a/src/fakeroot/opt/45drives/tools/dmap +++ b/src/fakeroot/opt/45drives/tools/dmap @@ -428,8 +428,8 @@ def create_vdev_id(server): def alias_f8(server,alias_template,phy_order): # the physical order of the cards is reversed in each section group of 4. f8_order = { - "SAS9305-24i": [2,3,1,0, 6,7,5,4, 18,19,17,16, 22,23,21,20, 10,11,9,8, 14,15,13,12], - "9600-24i": [27,28,29,30, 31,32,33,34, 35,36,37,38, 39,41,41,42, 43,44,45,46, 47,48,49,50] + "SAS9305-24i": [0,1,3,2, 4,5,7,6, 8,9,11,10, 20,21,23,22, 16,17,19,18, 12,13,15,14], + "9600-24i": [30,29,28,27, 34,33,32,31, 46,45,44,43, 42,41,41,39, 38,37,36,35, 50,49,48,47] } vdev_id_str = "" for i in range(0,len(server["HBA"])):