diff options
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.patch | 18 |
1 files changed, 10 insertions, 8 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 index 7e37cbc2c1..738f8eb7b6 100644 --- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch +++ b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5d8128f3832fd11fd046d1d1ad86c4ee7bc1dff0 Mon Sep 17 00:00:00 2001 | 1 | From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 9 Nov 2016 19:41:13 -0800 | 3 | Date: Thu, 21 Feb 2019 16:28:21 +0800 |
4 | Subject: [PATCH 4/9] rules: whitelist hd* devices | 4 | Subject: [PATCH 4/5] rules: whitelist hd* devices |
5 | 5 | ||
6 | qemu by default emulates IDE and the linux-yocto kernel(s) use | 6 | qemu by default emulates IDE and the linux-yocto kernel(s) use |
7 | CONFIG_IDE instead of the more modern libsata, so disks appear as | 7 | CONFIG_IDE instead of the more modern libsata, so disks appear as |
@@ -11,23 +11,25 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] | |||
11 | 11 | ||
12 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | 12 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | [rebased for systemd 241] | ||
15 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | --- | 16 | --- |
15 | rules/60-persistent-storage.rules | 2 +- | 17 | rules/60-persistent-storage.rules | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 19 | ||
18 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules | 20 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules |
19 | index 8ddb7577c..811e948ad 100644 | 21 | index 1d8880e..e53c8ea 100644 |
20 | --- a/rules/60-persistent-storage.rules | 22 | --- a/rules/60-persistent-storage.rules |
21 | +++ b/rules/60-persistent-storage.rules | 23 | +++ b/rules/60-persistent-storage.rules |
22 | @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" | 24 | @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" |
23 | ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" | 25 | ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" |
24 | 26 | ||
25 | SUBSYSTEM!="block", GOTO="persistent_storage_end" | 27 | SUBSYSTEM!="block", GOTO="persistent_storage_end" |
26 | -KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*", GOTO="persistent_storage_end" | 28 | -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" |
27 | +KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|hd*", 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" |
28 | 30 | ||
29 | # ignore partitions that span the entire disk | 31 | # ignore partitions that span the entire disk |
30 | TEST=="whole_disk", GOTO="persistent_storage_end" | 32 | TEST=="whole_disk", GOTO="persistent_storage_end" |
31 | -- | 33 | -- |
32 | 2.11.0 | 34 | 2.7.4 |
33 | 35 | ||