blob: 738f8eb7b697744ebaad4dc25b13eeeebe27d1b7 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 21 Feb 2019 16:28:21 +0800
4Subject: [PATCH 4/5] rules: whitelist hd* devices
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08005
6qemu by default emulates IDE and the linux-yocto kernel(s) use
7CONFIG_IDE instead of the more modern libsata, so disks appear as
8/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated.
9
10Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]
11
12Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishop19323692019-04-05 15:28:33 -040014[rebased for systemd 241]
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016---
17 rules/60-persistent-storage.rules | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
Brad Bishop19323692019-04-05 15:28:33 -040021index 1d8880e..e53c8ea 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022--- a/rules/60-persistent-storage.rules
23+++ b/rules/60-persistent-storage.rules
24@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
25 ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
26
27 SUBSYSTEM!="block", GOTO="persistent_storage_end"
Brad Bishop19323692019-04-05 15:28:33 -040028-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
29+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end"
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080030
31 # ignore partitions that span the entire disk
32 TEST=="whole_disk", GOTO="persistent_storage_end"
33--
Brad Bishop19323692019-04-05 15:28:33 -0400342.7.4
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035