build_image, mod_image_for_*: break out make_image_bootable

mod_image_for_test.sh

 #!/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 modify a keyfob-based chromeos system image for testability.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 210 matching lines @@
 
 # Let's have a look at the image just in case..
 if [ "${VERIFY}" = "true" ]; then
   pushd "${ROOT_FS_DIR}"
   bash
   popd
 fi
 
 cleanup
 
+# Now make it bootable with the flags from build_image
+${SCRIPTS_DIR}/bin/cros_make_image_bootable $(dirname "${FLAGS_image}") \
+                                            $(basename "${FLAGS_image}")
+
 print_time_elapsed
 
 trap - EXIT