From 437cd52f28d51e1db652206497a41fbe3bab9124 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Feb 26 2020 21:33:08 +0000
Subject: Modify the downstream udev rule to use bfq to only apply to disks


---

diff --git a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch b/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch
deleted file mode 100644
index 5714b53..0000000
--- a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 464a73411c13596a130a7a8f0ac00ca728e5f69e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 14 Aug 2019 15:57:42 +0200
-Subject: [PATCH] udev: use bfq as the default scheduler
-
-As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828.
-Test results are that bfq seems to behave better and more consistently on
-typical hardware. The kernel does not have a configuration option to set
-the default scheduler, and it currently needs to be set by userspace.
-
-See the bug for more discussion and links.
----
- rules/60-block-scheduler.rules | 5 +++++
- rules/meson.build              | 1 +
- 2 files changed, 6 insertions(+)
- create mode 100644 rules/60-block-scheduler.rules
-
-diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules
-new file mode 100644
-index 00000000000..480b941761f
---- /dev/null
-+++ b/rules.d/60-block-scheduler.rules
-@@ -0,0 +1,5 @@
-+# 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*", \
-+  ATTR{queue/scheduler}="bfq"
-diff --git a/rules.d/meson.build b/rules.d/meson.build
-index b6a32ba77e2..1da958b4d46 100644
---- a/rules.d/meson.build
-+++ b/rules.d/meson.build
-@@ -2,6 +2,7 @@
- 
- rules = files('''
-         60-block.rules
-+        60-block-scheduler.rules
-         60-cdrom_id.rules
-         60-drm.rules
-         60-evdev.rules
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 <zbyszek@in.waw.pl> - 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 <awilliam@redhat.com> - 245~rc1-3
 - Revert 097537f0 to fix plymouth etc. running when they shouldn't (#1803293)
diff --git a/use-bfq-scheduler.patch b/use-bfq-scheduler.patch
new file mode 100644
index 0000000..1824712
--- /dev/null
+++ b/use-bfq-scheduler.patch
@@ -0,0 +1,41 @@
+From 464a73411c13596a130a7a8f0ac00ca728e5f69e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 14 Aug 2019 15:57:42 +0200
+Subject: [PATCH] udev: use bfq as the default scheduler
+
+As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828.
+Test results are that bfq seems to behave better and more consistently on
+typical hardware. The kernel does not have a configuration option to set
+the default scheduler, and it currently needs to be set by userspace.
+
+See the bug for more discussion and links.
+---
+ rules/60-block-scheduler.rules | 5 +++++
+ rules/meson.build              | 1 +
+ 2 files changed, 6 insertions(+)
+ create mode 100644 rules/60-block-scheduler.rules
+
+diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules
+new file mode 100644
+index 00000000000..480b941761f
+--- /dev/null
++++ b/rules.d/60-block-scheduler.rules
+@@ -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
+--- a/rules.d/meson.build
++++ b/rules.d/meson.build
+@@ -2,6 +2,7 @@
+ 
+ rules = files('''
+         60-block.rules
++        60-block-scheduler.rules
+         60-cdrom_id.rules
+         60-drm.rules
+         60-evdev.rules