From af629c914c4ee22351827fe31d20a128277a3d04 Mon Sep 17 00:00:00 2001 From: Ramakrishnan G Date: Mon, 4 May 2015 09:41:16 +0000 Subject: [PATCH] Support custom kernel cmdline args for deploy iso This commit adds support for providing custom kernel cmdline args while building deploy ISO. This is useful for adding kernel cmdline like 'console=ttyS1' in environment (assuming all bare metals have been configured to output to COM2 in BIOS). Closes-Bug: 1451634 Change-Id: I20b04d9d104cfe46df0439c3f567a721a27e186a --- elements/iso/cleanup.d/100-build-iso | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elements/iso/cleanup.d/100-build-iso b/elements/iso/cleanup.d/100-build-iso index 62d4b9d2..0efc6439 100755 --- a/elements/iso/cleanup.d/100-build-iso +++ b/elements/iso/cleanup.d/100-build-iso @@ -134,12 +134,14 @@ IMAGE_NAME=${IMAGE_NAME:-'image'} if echo $IMAGE_ELEMENT | grep -q '\bramdisk\b'; then EMITTED_KERNEL=$IMAGE_NAME.kernel EMITTED_RAMDISK=$IMAGE_NAME.initramfs - EMITTED_KERNEL_CMDLINE_ARGS="boot_method=vmedia" + DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS=${DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS:-} + EMITTED_KERNEL_CMDLINE_ARGS="boot_method=vmedia $DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS" EMITTED_ISO_FILENAME=$IMAGE_NAME.iso elif echo $IMAGE_ELEMENT | grep -q '\bironic-agent\b'; then EMITTED_KERNEL=$IMAGE_NAME.vmlinuz EMITTED_RAMDISK=$IMAGE_NAME.initramfs - EMITTED_KERNEL_CMDLINE_ARGS="boot_method=vmedia" + DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS=${DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS:-} + EMITTED_KERNEL_CMDLINE_ARGS="boot_method=vmedia $DIB_DEPLOY_ISO_KERNEL_CMDLINE_ARGS" EMITTED_ISO_FILENAME=$IMAGE_NAME.iso elif echo $IMAGE_ELEMENT | grep -q '\bbaremetal\b'; then EMITTED_KERNEL=${IMAGE_NAME}.vmlinuz