Skip to contentSkip to conversation

Revert "boot-directdisk.bbclass: use rootfs UUID by default"

PATCH New Patrick Ohly 1 participant 1 message Sep 9, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/boot-directdisk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/boot-directdisk.bbclass +1 -1
index 7cb0ab0..600e21a 100644
@@ -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)}'
Signature · 1 line
2.1.4