From: Patrick Ohly <patrick.ohly@intel.com>
Date: Wed, 9 Sep 2015 12:31:30 +0000 (+0200)
Subject: Revert "boot-directdisk.bbclass: use rootfs UUID by default"
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28977
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8478024bd25651aa866d4582dcc193d51553554a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 7cb0ab071f9..600e21abcfe 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)}'