summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
deleted file mode 100644
index f9c5996ffb..0000000000
--- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 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
5
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>
14[rebased for systemd 241]
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
16[rebased for systemd 243]
17Signed-off-by: Scott Murray <scott.murray@konsulko.com>
18---
19 rules/60-persistent-storage.rules | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
23index 7802b1c94f..c0534ae26a 100644
24--- a/rules/60-persistent-storage.rules
25+++ b/rules/60-persistent-storage.rules
26@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
27 ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
28
29 SUBSYSTEM!="block", GOTO="persistent_storage_end"
30-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
31+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end"
32
33 # ignore partitions that span the entire disk
34 TEST=="whole_disk", GOTO="persistent_storage_end"