From 842a797460cd07b779ab588a4ece7e5d4d97417b Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 29 Jul 2014 00:05:04 -0700 Subject: image-vmdk.bbclass: use sda rather than hda The modern kernels may not support IDE (CONFIG_IDE=y), but it should support SCSI in most of the cases. The boot-directdisk.bbclass uses sda, too. Remove an extra space from image-live.bbclass and image-vmdk.bbclass to not confuse the user. Signed-off-by: Robert Yang Signed-off-by: Saul Wold --- meta/classes/image-live.bbclass | 2 +- meta/classes/image-vmdk.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index c7e6937fa9..7b770fb353 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -2,7 +2,7 @@ AUTO_SYSLINUXCFG = "1" INITRD_IMAGE ?= "core-image-minimal-initramfs" INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" -SYSLINUX_ROOT = "root=/dev/ram0 " +SYSLINUX_ROOT = "root=/dev/ram0" SYSLINUX_TIMEOUT ?= "10" SYSLINUX_LABELS ?= "boot install" LABELS_append = " ${SYSLINUX_LABELS} " diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass index 703c00ea3c..77b7facd41 100644 --- a/meta/classes/image-vmdk.bbclass +++ b/meta/classes/image-vmdk.bbclass @@ -1,7 +1,7 @@ #NOISO = "1" -SYSLINUX_ROOT = "root=/dev/hda2 " +SYSLINUX_ROOT ?= "root=/dev/sda2" SYSLINUX_PROMPT ?= "0" SYSLINUX_TIMEOUT ?= "10" SYSLINUX_LABELS = "boot" -- cgit 1.2.3-korg