diff --git a/systemd.spec b/systemd.spec index e563211..3466387 100644 --- a/systemd.spec +++ b/systemd.spec @@ -66,7 +66,7 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ %endif # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 -Patch0001: https://github.com/keszybz/systemd/commit/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch +Patch0001: use-bfq-scheduler.patch Patch0010: https://github.com/systemd/systemd/commit/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch @@ -744,6 +744,7 @@ fi %changelog * Wed Feb 26 2020 Zbigniew Jędrzejewski-Szmek - 245~rc1-4 - Fix scriptlet to not kill non-systemd pid1 (#1803240) +- Modify the downstream udev rule to use bfq to only apply to disks (#1803500) * Tue Feb 18 2020 Adam Williamson - 245~rc1-3 - Revert 097537f0 to fix plymouth etc. running when they shouldn't (#1803293) diff --git a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch b/use-bfq-scheduler.patch similarity index 97% rename from 464a73411c13596a130a7a8f0ac00ca728e5f69e.patch rename to use-bfq-scheduler.patch index 5714b53..1824712 100644 --- a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch +++ b/use-bfq-scheduler.patch @@ -20,11 +20,12 @@ new file mode 100644 index 00000000000..480b941761f --- /dev/null +++ b/rules.d/60-block-scheduler.rules -@@ -0,0 +1,5 @@ +@@ -0,0 +1,6 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="add", SUBSYSTEM=="block", \ + KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \ ++ DEVTYPE=="disk", \ + ATTR{queue/scheduler}="bfq" diff --git a/rules.d/meson.build b/rules.d/meson.build index b6a32ba77e2..1da958b4d46 100644