diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2015-09-09 14:31:30 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:47:10 +0100 |
| commit | 8478024bd25651aa866d4582dcc193d51553554a (patch) | |
| tree | b7c2d4c022595e5b9be650fea67380bd75b34dd8 | |
| parent | 552daf60c58784c8f1acc12c5a443a44a922f743 (diff) | |
| download | openembedded-core-8478024bd25651aa866d4582dcc193d51553554a.tar.gz openembedded-core-8478024bd25651aa866d4582dcc193d51553554a.tar.bz2 openembedded-core-8478024bd25651aa866d4582dcc193d51553554a.zip | |
Revert "boot-directdisk.bbclass: use rootfs UUID by default"
This reverts commit 8ca8e2e5bf4a9f01dc48300149a8e1d71d715400.
Further testing showed the kernel does not support root=UUID; it is
something typically handled by the initramfs.
Because boot-directdisk.bbclass cannot know whether it is using a
suitable initramfs, root=UUID cannot be the default. Instead, it will
have to be set in image recipes on a case-by-case basis.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 7cb0ab071f..600e21abcf 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -60,7 +60,7 @@ inherit ${EFI_CLASS} AUTO_SYSLINUXCFG = "1" DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" -SYSLINUX_ROOT ?= "root=UUID=<<uuid-of-rootfs>>" +SYSLINUX_ROOT ?= "root=/dev/sda2" SYSLINUX_TIMEOUT ?= "10" IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "true", "false", d)}' |