updated build, changed when /var/cache/45drives/ubm is removed in dma…

…p for autoalias servers

CHANGELOG.md

@@ -1,3 +1,3 @@
-## 45drives-tools 3.0.6-4
+## 45drives-tools 3.0.6-5
 
-* fix getting ubm map key (strip whitespace)
+* changed order in which /var/cache/45drives/ubm is removed. Rules will trigger after removal (for re-generation)

manifest.json

@@ -4,7 +4,7 @@
     "title": "45drives-tools",
     "prerelease": true,
     "version": "3.0.6",
-    "buildVersion": "4",
+    "buildVersion": "5",
     "author": "Mark Hooper <[email protected]>",
     "url": "https://github.com/45Drives/tools",
     "category": "utils",
@@ -66,7 +66,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "3.0.6",
-        "buildVersion": "4",
+        "buildVersion": "5",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <[email protected]>",

packaging/el7/main.spec

@@ -58,6 +58,9 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Wed Jan 03 2024 Mark Hooper <[email protected]> 3.0.6-5
+- changed order in which /var/cache/45drives/ubm is removed. Rules will trigger after
+  removal (for re-generation)
 * Wed Jan 03 2024 Joshua Boudreau <[email protected]> 3.0.6-4
 - fix getting ubm map key (strip whitespace)
 * Tue Jan 02 2024 Joshua Boudreau <[email protected]> 3.0.6-3

packaging/el8/main.spec

@@ -63,6 +63,9 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Wed Jan 03 2024 Mark Hooper <[email protected]> 3.0.6-5
+- changed order in which /var/cache/45drives/ubm is removed. Rules will trigger after
+  removal (for re-generation)
 * Wed Jan 03 2024 Joshua Boudreau <[email protected]> 3.0.6-4
 - fix getting ubm map key (strip whitespace)
 * Tue Jan 02 2024 Joshua Boudreau <[email protected]> 3.0.6-3

packaging/focal/changelog

@@ -1,3 +1,10 @@
+45drives-tools (3.0.6-5focal) focal; urgency=medium
+
+  * changed order in which /var/cache/45drives/ubm is removed. Rules will trigger
+    after removal (for re-generation)
+
+ -- Mark Hooper <[email protected]>  Wed, 03 Jan 2024 11:03:43 -0400
+
 45drives-tools (3.0.6-4focal) focal; urgency=medium
 
   * fix getting ubm map key (strip whitespace)

tools/dmap

@@ -859,14 +859,14 @@ def main():
 
 	# check to see if server is capable of auto aliasing
 	if server.get("Auto Alias",False):
+		log("Server model {sm} is eligible for automatic device aliasing via udev rules.".format(sm=server["Model"]))
+		log("dmap will not modify /etc/vdev_id.conf when it is created automatically by udev rules.")
 		#trigger udev
 		if options.trigger_udev:
+			log("Removing ubm map key directory to fix potential aliasing issues with auto-aliasing. (/var/cache/45drives/ubm)")
+			shutil.rmtree("/var/cache/45drives/ubm",ignore_errors = True)
 			reload_udev()
 			trigger_udev()
-		log("Server model {sm} is eligible for automatic device aliasing via udev rules.".format(sm=server["Model"]))
-		log("dmap will not modify /etc/vdev_id.conf when it is created automatically by udev rules.")
-		log("Removing ubm map key directory to fix potential aliasing issues with auto-aliasing. (/var/cache/45drives/ubm)")
-		shutil.rmtree("/var/cache/45drives/ubm",ignore_errors = True)
 		sys.exit(0)
 
 	vdev_id_conf = create_vdev_id(server)