Merge pull request #29 from 45Drives/dev-josh

move udev rules to udev dir, add rule to set flash scheduler to kyber
45Drives · Oct 30, 2024 · 26f5eba · 26f5eba
2 parents aef8864 + 5515a63
commit 26f5eba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,12 @@ install:
 	install -m 644 -t "$(DESTDIR)/opt/45drives/ubm" \
 		ubm/ubm_funcs.sh \
 		ubm/slot_name_map.txt
-	install -m 644 -t "$(DESTDIR)/usr/lib/udev/rules.d" ubm/67-ubm.rules
+	install -m 644 -t "$(DESTDIR)/usr/lib/udev/rules.d" \
+		udev/61-flash-io-scheduler.rules \
+		udev/67-ubm.rules \
+		udev/68-vdev.rules
+	install -m 644 -t "$(DESTDIR)/opt/45drives/tools" \
+		udev/68-vdev.rules
 ifdef TOOLS_VERSION
 	echo $(TOOLS_VERSION) > "$(DESTDIR)/etc/45drives/server_info/tools_version"
 endif
@@ -55,7 +60,7 @@ uninstall:
 	rm -f "$(DESTDIR)/usr/bin/lsdev"
 	rm -f "$(DESTDIR)/usr/bin/server_identifier"
 	rm -f "$(DESTDIR)/usr/bin/zcreate"
-	rm -f "$(DESTDIR)/usr/lib/udev/rules.d/67-ubm.rules"
+	rm -f "$(DESTDIR)/usr/lib/udev/rules.d/{61-flash-io-scheduler.rules,67-ubm.rules}"
 	rm -f "$(DESTDIR)/usr/bin/dalias"
 	rm -f "$(DESTDIR)/usr/bin/wipedev"
 	rm -f "$(DESTDIR)/usr/bin/slot_led_ctrl"

diff --git a/udev/61-flash-io-scheduler.rules b/udev/61-flash-io-scheduler.rules
@@ -0,0 +1,2 @@
+# set IO scheduler to kyber for flash
+ACTION=="add|change", KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="kyber"
diff --git a/ubm/67-ubm.rules → udev/67-ubm.rules b/ubm/67-ubm.rules → udev/67-ubm.rules
diff --git a/tools/68-vdev.rules → udev/68-vdev.rules b/tools/68-vdev.rules → udev/68-vdev.rules
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# set IO scheduler to kyber for flash
		ACTION=="add\|change", KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="kyber"