build_image & make_bootable: allow additional kernel cmdline args

build_image

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 45 matching lines @@
 # ceil(0.1 * rootfs_size) is a good minimum.
 DEFINE_integer rootfs_hash_pad 8 \
   "MiBs reserved at the end of the rootfs image."
 DEFINE_integer statefulfs_size 1024 \
   "stateful filesystem size in MiBs."
 DEFINE_boolean preserve ${FLAGS_FALSE} \
   "Attempt to preserve the previous build image if one can be found (unstable, \
 kernel/firmware not updated)"
 DEFINE_boolean fast ${DEFAULT_FAST} \
   "Call many emerges in parallel"
+DEFINE_string boot_args "noinitrd" \
+  "Additional boot arguments to pass to the commandline"
 
 DEFINE_string usb_disk /dev/sdb3 \
   "Path syslinux should use to do a usb boot. Default: /dev/sdb3"
 
 DEFINE_boolean enable_rootfs_verification ${FLAGS_TRUE} \
   "Default all bootloaders to use kernel-based root fs integrity checking."
 DEFINE_integer verity_error_behavior 1 \
   "Kernel verified boot error behavior (0: I/O errors, 1: panic, 2: nothing) \
 Default: 1"
 DEFINE_integer verity_depth 1 \
@@ skipping 263 matching lines @@
     -u -r "${rootfs}" -s "${statefs}" -e "${espfs}"
   delete_prompt
 }
 
 # Takes no arguments and populates the configuration for
 # cros_make_image_bootable.
 create_boot_desc() {
   cat <<EOF > ${OUTPUT_DIR}/boot.desc
   --arch="${ARCH}"
   --output_dir="${OUTPUT_DIR}"
+  --boot_args="${FLAGS_boot_args}"
   --rootfs_size="${FLAGS_rootfs_size}"
   --rootfs_hash_pad="${FLAGS_rootfs_hash_pad}"
   --rootfs_hash="${ROOT_FS_HASH}"
   --rootfs_mountpoint="${ROOT_FS_DIR}"
   --statefulfs_mountpoint="${STATEFUL_FS_DIR}"
   --espfs_mountpoint="${ESP_FS_DIR}"
   --verity_error_behavior="${FLAGS_verity_error_behavior}"
   --verity_depth="${FLAGS_verity_depth}"
   --verity_max_ios="${FLAGS_verity_max_ios}"
   --verity_algorithm="${FLAGS_verity_algorithm}"
@@ skipping 249 matching lines @@
   # on update.
   # (This script does not populate vmlinuz.A and .B needed by syslinux.)
   enable_rootfs_verification=
   if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
     enable_rootfs_verification="--enable_rootfs_verification"
   fi
 
   ${SCRIPTS_DIR}/create_legacy_bootloader_templates.sh \
     --arch=${ARCH} \
     --to="${ROOT_FS_DIR}"/boot \
+    --boot_args="${FLAGS_boot_args}" \
     --install \
     ${enable_rootfs_verification}
 
   # Don't test the factory install shim or the dev install shim
   if [ ${FLAGS_factory_install} -eq ${FLAGS_FALSE} ] &&
      [ ${FLAGS_dev_install} -eq ${FLAGS_FALSE} ]; then
     # Check that the image has been correctly created.
     "${SCRIPTS_DIR}/test_image" \
       --root="${ROOT_FS_DIR}" \
       --target="${ARCH}"
@@ skipping 121 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 echo "To copy to USB keyfob, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR} --board=${BOARD}"
 echo "from the scripts directory where you entered the chroot."