diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2015-09-21 16:30:10 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:58:21 +0100 |
| commit | 3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df (patch) | |
| tree | 777c706ee6223f8641f44bd9657e9ed3fd031922 /meta/recipes-core | |
| parent | eb76b668e815fbecd18271808b871fc3b0f15e65 (diff) | |
| download | openembedded-core-3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df.tar.gz openembedded-core-3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df.tar.bz2 openembedded-core-3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df.zip | |
systemd: apply persistent storage udev rules also for /dev/hd*
This fixes booting with initramfs and root=UUID on machines with IDE
disks, like "runqemu hdddirect", and kernels which still use the
deprecated CONFIG_IDE.
v2: Rebased against current master-next.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -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 @@ +From f77b7e5626e70c3a775e993816a33af5a61dea42 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.ohly@intel.com> +Date: Wed, 16 Sep 2015 13:55:58 +0200 +Subject: [PATCH] rules: whitelist hd* devices + +qemu by default emulates IDE and the linux-yocto kernel(s) use +CONFIG_IDE instead of the more modern libsata, so disks appear as +/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. + +Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +--- + rules/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules +index 0b14bb4..1c4d97a 100644 +--- a/rules/60-persistent-storage.rules ++++ b/rules/60-persistent-storage.rules +@@ -6,7 +6,7 @@ + ACTION=="remove", GOTO="persistent_storage_end" + + SUBSYSTEM!="block", GOTO="persistent_storage_end" +-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end" ++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" + + # ignore partitions that span the entire disk + TEST=="whole_disk", GOTO="persistent_storage_end" +-- +2.1.4 + 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 \ file://00-create-volatile.conf \ file://init \ file://run-ptest \ + file://rules-whitelist-hd-devices.patch \ " SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch" |