summaryrefslogtreecommitdiffstats
path: root/meta/classes/boot-directdisk.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
-rw-r--r--meta/classes/boot-directdisk.bbclass16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 4b9d7bd128..c58c6f0c53 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -61,15 +61,15 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
61SYSLINUX_ROOT ?= "root=/dev/sda2" 61SYSLINUX_ROOT ?= "root=/dev/sda2"
62SYSLINUX_TIMEOUT ?= "10" 62SYSLINUX_TIMEOUT ?= "10"
63 63
64populate() { 64boot_direct_populate() {
65 DEST=$1 65 dest=$1
66 install -d ${DEST} 66 install -d $dest
67 67
68 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 68 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
69 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz 69 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage $dest/vmlinuz
70 70
71 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then 71 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
72 install -m 0644 ${INITRD} ${DEST}/initrd 72 install -m 0644 ${INITRD} $dest/initrd
73 fi 73 fi
74 74
75} 75}
@@ -79,13 +79,13 @@ build_boot_dd() {
79 HDDIMG="${S}/hdd.image" 79 HDDIMG="${S}/hdd.image"
80 IMAGE=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect 80 IMAGE=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect
81 81
82 populate ${HDDDIR} 82 boot_direct_populate $HDDDIR
83 83
84 if [ "${PCBIOS}" = "1" ]; then 84 if [ "${PCBIOS}" = "1" ]; then
85 syslinux_hddimg_populate 85 syslinux_hddimg_populate $HDDDIR
86 fi 86 fi
87 if [ "${EFI}" = "1" ]; then 87 if [ "${EFI}" = "1" ]; then
88 grubefi_hddimg_populate 88 grubefi_hddimg_populate $HDDDIR
89 fi 89 fi
90 90
91 BLOCKS=`du -bks $HDDDIR | cut -f 1` 91 BLOCKS=`du -bks $HDDDIR | cut -f 1`