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 | 13 |
1 files changed, 7 insertions, 6 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 8666bdc652..eb380ce78d 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 8cc1ae11f54dcc38ee2168b0f99703b835dd3942 Mon Sep 17 00:00:00 2001 | 1 | From ab5a27040133f7cdf062ac8cfeb94e081d3567b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 9 Nov 2016 19:41:13 -0800 | 3 | Date: Wed, 9 Nov 2016 19:41:13 -0800 |
| 4 | Subject: [PATCH 12/19] rules: whitelist hd* devices | 4 | Subject: [PATCH 07/14] 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,24 @@ 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 | |||
| 14 | --- | 15 | --- |
| 15 | rules/60-persistent-storage.rules | 2 +- | 16 | rules/60-persistent-storage.rules | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | 18 | ||
| 18 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules | 19 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules |
| 19 | index c13d05c..b14fbed 100644 | 20 | index d2745f65f..63f472be8 100644 |
| 20 | --- a/rules/60-persistent-storage.rules | 21 | --- a/rules/60-persistent-storage.rules |
| 21 | +++ b/rules/60-persistent-storage.rules | 22 | +++ b/rules/60-persistent-storage.rules |
| 22 | @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" | 23 | @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" |
| 23 | ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" | 24 | ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" |
| 24 | 25 | ||
| 25 | SUBSYSTEM!="block", GOTO="persistent_storage_end" | 26 | 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*", 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*", 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" | 28 | +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" |
| 28 | 29 | ||
| 29 | # ignore partitions that span the entire disk | 30 | # ignore partitions that span the entire disk |
| 30 | TEST=="whole_disk", GOTO="persistent_storage_end" | 31 | TEST=="whole_disk", GOTO="persistent_storage_end" |
| 31 | -- | 32 | -- |
| 32 | 2.10.2 | 33 | 2.13.2 |
| 33 | 34 | ||