[PATCH 0/1] image-vmdk.bbclass: use sda rather than hda

[PATCH 0/1] image-vmdk.bbclass: use sda rather than hda

[Robert Yang]

The following changes since commit 91ca6b1b2e009381d8e813906654c0958eee7efc:

  lib/oe/rootfs: Improve error message whitespace (2014-07-28 12:20:56 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/vmdk
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/vmdk

Robert Yang (1):
  image-vmdk.bbclass: use sda rather than hda

 meta/classes/image-live.bbclass |    2 +-
 meta/classes/image-vmdk.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 1/1] image-vmdk.bbclass: use sda rather than hda

[Robert Yang]

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>
---
 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 c7e6937..7b770fb 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 703c00e..77b7fac 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"
-- 
1.7.9.5