From: Grant Slater <git@firefishy.com>
Date: Wed, 15 Jan 2020 13:47:36 +0000 (+0000)
Subject: device: Fix QEMU udev
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/cf300fbcd4d79d67d5fbc74f2b62080b55d435ed?hp=75f3a85fe362b3d1163bf1265d0bec291a692c76

device: Fix QEMU udev
---

diff --git a/cookbooks/devices/templates/default/udev.rules.erb b/cookbooks/devices/templates/default/udev.rules.erb
index 3b5bab5dd..453357815 100644
--- a/cookbooks/devices/templates/default/udev.rules.erb
+++ b/cookbooks/devices/templates/default/udev.rules.erb
@@ -93,8 +93,9 @@ ACTION=="add", SUBSYSTEM=="block", DRIVERS=="virtio_blk", ATTR{queue/read_ahead_
 # Note virtio sets scheduler to none automatically
 
 # QEMU Disk IO tune
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="QEMU", ENV{ID_MODEL}=="QEMU_HARDDISK", ATTR{queue/read_ahead_kb}="4096"
-# Note QEMU sets scheduler to none automatically
+ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="QEMU_HARDDISK", ATTR{queue/read_ahead_kb}="4096"
+ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="QEMU_HARDDISK", ATTR{queue/scheduler}="noop"
+# Vendor is sometimes missing
 
 # Increase default MD raid5/raid6 strip cache
 ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{MD_LEVEL}=="raid5", ATTR{md/stripe_cache_size}="8192"