build_image & make_bootable: allow additional kernel cmdline args

bin/cros_make_image_bootable

 #!/bin/bash
 #
 # Copyright (c) 2010 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 which ensures that a given image has an up-to-date
 # kernel partition, rootfs integrity hashes, and legacy bootloader configs.
 
 # Load common constants.  This should be the first executable line.
@@ skipping 50 matching lines @@
   "Directory to place output in."
 DEFINE_string image "chromiumos_base.img" \
   "Full path to the chromiumos image to make bootable."
 DEFINE_string arch "x86" \
   "Architecture to make bootable for: arm or x86"
 DEFINE_string usb_disk "/dev/sdb3" \
   "Path syslinux should use to do a usb boot."
 DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \
   "Whether the mount dirs should be removed on completion."
 
+DEFINE_string boot_args "noinitrd" \
+  "Additional boot arguments to pass to the commandline"
+
 DEFINE_integer rootfs_size 720 \
   "rootfs filesystem size in MBs."
 # ceil(0.1 * rootfs_size) is a good minimum.
 DEFINE_integer rootfs_hash_pad 8 \
   "MBs reserved at the end of the rootfs image."
 
 DEFINE_string rootfs_hash "/tmp/rootfs.hash" \
   "Path where the rootfs hash should be stored."
 DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
   "Default all bootloaders to use kernel-based root fs integrity checking."
@@ skipping 69 matching lines @@
   fi
 
   # Builds the kernel partition image.  The temporary files are kept around
   # so that we can perform a load_kernel_test later on the final image.
   ${SCRIPTS_DIR}/build_kernel_image.sh \
     --arch="${FLAGS_arch}" \
     --to="${FLAGS_output_dir}/vmlinuz.image" \
     --hd_vblock="${FLAGS_output_dir}/vmlinuz_hd.vblock" \
     --vmlinuz="${FLAGS_rootfs_mountpoint}/boot/vmlinuz" \
     --working_dir="${FLAGS_output_dir}" \
+    --boot_args="${FLAGS_boot_args}" \
     --keep_work \
     --rootfs_image=${root_dev} \
     --rootfs_hash=${FLAGS_rootfs_hash} \
     --verity_hash_alg=${FLAGS_verity_algorithm} \
     --verity_tree_depth=${FLAGS_verity_depth} \
     --verity_max_ios=${FLAGS_verity_max_ios} \
     --verity_error_behavior=${FLAGS_verity_error_behavior} \
     --root=${cros_root} \
     --keys_dir="${FLAGS_keys_dir}" \
     ${use_dev_keys}
@@ skipping 82 matching lines @@
 mkdir -p ${FLAGS_statefulfs_mountpoint}
 mkdir -p ${FLAGS_espfs_mountpoint}
 
 make_image_bootable ${IMAGE}
 
 if [ ${FLAGS_cleanup_dirs} -eq ${FLAGS_TRUE} ]; then
   rmdir ${FLAGS_rootfs_mountpoint}
   rmdir ${FLAGS_statefulfs_mountpoint}
   rmdir ${FLAGS_espfs_mountpoint}
 fi