summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-07-29 00:05:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:21:13 +0100
commit842a797460cd07b779ab588a4ece7e5d4d97417b (patch)
tree5b4586a3aefede247166cca8dd59348d66ff3635
parentaea4b2d58856226c471922dfa40650cba2f5a36a (diff)
downloadopenembedded-core-842a797460cd07b779ab588a4ece7e5d4d97417b.tar.gz
openembedded-core-842a797460cd07b779ab588a4ece7e5d4d97417b.tar.bz2
openembedded-core-842a797460cd07b779ab588a4ece7e5d4d97417b.zip
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 <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/image-live.bbclass2
-rw-r--r--meta/classes/image-vmdk.bbclass2
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"