From 2bf8859cf8f31164fc033b52c1fc2779e168b411 Mon Sep 17 00:00:00 2001 From: Arkaitz Ruiz Alvarez Date: Thu, 7 Jul 2011 15:47:31 -0700 Subject: [PATCH] Fix test images kernel commandline arguments By default, "cros_debug" should be included in the kernel commandline for developer images. This change adds "cros_debug" to the kernel commandline for test images, which are based on developer images but overwrite the boot arguments. TEST=Build test image, install on machine and grep "cros_debug" /proc/cmdline BUG=chromium-os:17393 Change-Id: Ie0de11baf60a3a69a7fef0639247e2edae455ffb Reviewed-on: http://gerrit.chromium.org/gerrit/3790 Tested-by: Arkaitz Ruiz Alvarez Reviewed-by: Chris Sosa --- build_image | 3 ++- image_to_vm.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_image b/build_image index 5cb36a6ee0..12e57a0843 100755 --- a/build_image +++ b/build_image @@ -869,7 +869,8 @@ mod_image_for_test () { # Now make it bootable with the flags from build_image "${SCRIPTS_DIR}/bin/cros_make_image_bootable" "${image_dir}" "${image_name}" \ - ${crosbug12352_flag} + ${crosbug12352_flag} \ + --force_developer_mode print_time_elapsed diff --git a/image_to_vm.sh b/image_to_vm.sh index 859c0b34d6..fb0d627aec 100755 --- a/image_to_vm.sh +++ b/image_to_vm.sh @@ -227,7 +227,8 @@ dd if="${TEMP_ESP}" of="${TEMP_IMG}" conv=notrunc bs=512 \ # to operate automatically below. ${SCRIPTS_DIR}/bin/cros_make_image_bootable $(dirname "${TEMP_IMG}") \ $(basename "${TEMP_IMG}") \ - --usb_disk /dev/sda3 + --usb_disk /dev/sda3 \ + --force_developer_mode echo Creating final image # Convert image to output format