diff options
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch new file mode 100644 index 0000000000..8975b05e01 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From f77b7e5626e70c3a775e993816a33af5a61dea42 Mon Sep 17 00:00:00 2001 | ||
2 | From: Patrick Ohly <patrick.ohly@intel.com> | ||
3 | Date: Wed, 16 Sep 2015 13:55:58 +0200 | ||
4 | Subject: [PATCH] rules: whitelist hd* devices | ||
5 | |||
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 | ||
8 | /dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. | ||
9 | |||
10 | Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] | ||
11 | |||
12 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | ||
13 | --- | ||
14 | rules/60-persistent-storage.rules | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules | ||
18 | index 0b14bb4..1c4d97a 100644 | ||
19 | --- a/rules/60-persistent-storage.rules | ||
20 | +++ b/rules/60-persistent-storage.rules | ||
21 | @@ -6,7 +6,7 @@ | ||
22 | ACTION=="remove", GOTO="persistent_storage_end" | ||
23 | |||
24 | 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*|hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end" | ||
27 | |||
28 | # ignore partitions that span the entire disk | ||
29 | TEST=="whole_disk", GOTO="persistent_storage_end" | ||
30 | -- | ||
31 | 2.1.4 | ||
32 | |||
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index ef8d297e02..4f90ef6edf 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb | |||
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ | |||
45 | file://00-create-volatile.conf \ | 45 | file://00-create-volatile.conf \ |
46 | file://init \ | 46 | file://init \ |
47 | file://run-ptest \ | 47 | file://run-ptest \ |
48 | file://rules-whitelist-hd-devices.patch \ | ||
48 | " | 49 | " |
49 | SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch" | 50 | SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch" |
50 | 51 | ||