summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-09-09 14:31:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:35 +0100
commitf7056fafd2dbd085e04a1ab54d4d8bbe83109592 (patch)
tree7b4a1d3ffe05b4e9363d7a6c884a9a7a1061b486
parenta2ec6d47207312b5a5750cd53f02c84cfa39045c (diff)
downloadpoky-f7056fafd2dbd085e04a1ab54d4d8bbe83109592.tar.gz
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. (From OE-Core rev: 8478024bd25651aa866d4582dcc193d51553554a) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/boot-directdisk.bbclass2
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}
60 60
61AUTO_SYSLINUXCFG = "1" 61AUTO_SYSLINUXCFG = "1"
62DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" 62DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
63SYSLINUX_ROOT ?= "root=UUID=<<uuid-of-rootfs>>" 63SYSLINUX_ROOT ?= "root=/dev/sda2"
64SYSLINUX_TIMEOUT ?= "10" 64SYSLINUX_TIMEOUT ?= "10"
65 65
66IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "true", "false", d)}' 66IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "true", "false", d)}'