diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch index 6143088e8c..8666bdc652 100644 --- a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch +++ b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5ebc0d87565a73710dea602c00b1586d5a1364e5 Mon Sep 17 00:00:00 2001 | 1 | From 8cc1ae11f54dcc38ee2168b0f99703b835dd3942 Mon Sep 17 00:00:00 2001 |
2 | From: Patrick Ohly <patrick.ohly@intel.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 16 Sep 2015 13:55:58 +0200 | 3 | Date: Wed, 9 Nov 2016 19:41:13 -0800 |
4 | Subject: [PATCH 12/36] rules: whitelist hd* devices | 4 | Subject: [PATCH 12/19] 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 |
@@ -10,23 +10,24 @@ CONFIG_IDE instead of the more modern libsata, so disks appear as | |||
10 | Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] | 10 | 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 | --- | 14 | --- |
14 | rules/60-persistent-storage.rules | 2 +- | 15 | rules/60-persistent-storage.rules | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 17 | ||
17 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules | 18 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules |
18 | index 0b14bb4..1c4d97a 100644 | 19 | index c13d05c..b14fbed 100644 |
19 | --- a/rules/60-persistent-storage.rules | 20 | --- a/rules/60-persistent-storage.rules |
20 | +++ b/rules/60-persistent-storage.rules | 21 | +++ b/rules/60-persistent-storage.rules |
21 | @@ -6,7 +6,7 @@ | 22 | @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" |
22 | ACTION=="remove", GOTO="persistent_storage_end" | 23 | ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" |
23 | 24 | ||
24 | SUBSYSTEM!="block", GOTO="persistent_storage_end" | 25 | SUBSYSTEM!="block", GOTO="persistent_storage_end" |
25 | -KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", 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*", GOTO="persistent_storage_end" |
26 | +KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end" | 27 | +KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*", GOTO="persistent_storage_end" |
27 | 28 | ||
28 | # ignore partitions that span the entire disk | 29 | # ignore partitions that span the entire disk |
29 | TEST=="whole_disk", GOTO="persistent_storage_end" | 30 | TEST=="whole_disk", GOTO="persistent_storage_end" |
30 | -- | 31 | -- |
31 | 1.8.3.1 | 32 | 2.10.2 |
32 | 33 | ||