Adding append to make_factory_package

make_factory_package.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 generate a factory install partition set and miniomaha.conf
 # file from a release image and a factory image. This creates a server
 # configuration that can be installed using a factory install shim.
 #
@@ skipping 10 matching lines @@
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" "Board for which the image was built"
 DEFINE_string factory "" \
   "Directory and file containing factory image: /path/chromiumos_test_image.bin"
 DEFINE_string firmware_updater "" \
   "If set, include the firmware shellball into the server configuration"
 DEFINE_string release "" \
   "Directory and file containing release image: /path/chromiumos_image.bin"
-
+DEFINE_string subfolder "" \

[Nick Sanders, 2010/10/22 18:06:08]

Can you add a comment somewhere in the file that mentions that you can only add
new subfolders, since the old configs will remain, and they must have different
board-ids. 

+  "If set, the name of the subfolder to put the payload items inside"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 if [ ! -f "${FLAGS_release}" ] ; then
   echo "Cannot find image file ${FLAGS_release}"
   exit 1
 fi
 
 if [ ! -f "${FLAGS_factory}" ] ; then
   echo "Cannot find image file ${FLAGS_factory}"
   exit 1
 fi
 
 if [ ! -z "${FLAGS_firmware_updater}" ] && \
    [ ! -f "${FLAGS_firmware_updater}" ] ; then
   echo "Cannot find firmware file ${FLAGS_firmware_updater}"
   exit 1
 fi
 
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # chars like ~ are processed; just doing FOO=`readlink -f ${FOO}` won't work.
 OMAHA_DIR=${SRC_ROOT}/platform/dev
 OMAHA_DATA_DIR=${OMAHA_DIR}/static/
 
+if [ ! -z "${FLAGS_subfolder}" ] ; then

[Hung-Te, 2010/10/22 09:18:12]

"! -z" should be replaced by "-n"

+  OMAHA_DATA_DIR=${OMAHA_DIR}/static/${FLAGS_subfolder}/
+fi
+
 if [ ${INSIDE_CHROOT} -eq 0 ]; then
   echo "Caching sudo authentication"
   sudo -v
   echo "Done"
 fi
 
 # Use this image as the source image to copy
 RELEASE_DIR=`dirname ${FLAGS_release}`
 FACTORY_DIR=`dirname ${FLAGS_factory}`
 RELEASE_IMAGE=`basename ${FLAGS_release}`
 FACTORY_IMAGE=`basename ${FLAGS_factory}`
 

[Hung-Te, 2010/10/22 09:18:12]

looks like no need of the blank line here

 
+
 prepare_omaha() {
   sudo rm -rf ${OMAHA_DATA_DIR}/rootfs-test.gz
   sudo rm -rf ${OMAHA_DATA_DIR}/rootfs-release.gz
   rm -rf ${OMAHA_DATA_DIR}/efi.gz
   rm -rf ${OMAHA_DATA_DIR}/oem.gz
   rm -rf ${OMAHA_DATA_DIR}/state.gz
-  rm -rf ${OMAHA_DIR}/miniomaha.conf
+  if [ ! -f "${OMAHA_DATA_DIR}" ] ; then
+    mkdir -p ${OMAHA_DATA_DIR}
+  fi
 }
 
 prepare_dir() {
   sudo rm -rf rootfs-test.gz
   sudo rm -rf rootfs-release.gz
   rm -rf efi.gz
   rm -rf oem.gz
   rm -rf state.gz
 }
 
@@ skipping 56 matching lines @@
     echo "Failed to find firmware updater: $SHELLBALL."
     exit 1
   fi
 
   cat $SHELLBALL | gzip -9 > firmware.gz
   firmware_hash=`cat firmware.gz | openssl sha1 -binary | openssl base64`
   mv firmware.gz ${OMAHA_DATA_DIR}
   echo "firmware: ${firmware_hash}"
 fi
 
-echo -n "
-config = [
- {
+# Are we appending another config?
+if [ ! -z "${FLAGS_subfolder}" ] && \

[Hung-Te, 2010/10/22 09:18:12]

No need the trailing \ . The && implies line concatenation.

"! -z" should be replaced by "-n".

+   [ -f ${OMAHA_DIR}"/miniomaha.conf" ] ; then

[Hung-Te, 2010/10/22 09:18:12]

Please include the variable in quote, like
 -f "${OMAHA_DIR}/miniomaha.conf"

+  sed '$d' < ${OMAHA_DIR}/miniomaha.conf > ${OMAHA_DIR}/miniomaha_tmp.conf

[Nick Sanders, 2010/10/22 18:06:08]

Can you also comment that this is deleting the last line, which is the closing
curly brace in the config.

+  mv ${OMAHA_DIR}/miniomaha_tmp.conf ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/10/22 09:18:12]

The sed + mv can be changed to
 sed -i '$d' "${OMAHA_DIR}/miniomaha.conf"

+  subfolder=${FLAGS_subfolder}"/"

[Hung-Te, 2010/10/22 09:18:12]

I'd prefer to write this as subfolder="${FLAGS_subfolder}/"

+else
+  echo -e "config = [\n" > ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/10/22 09:18:12]

This will create one more extra line.
I think 'echo "config = [" > ' is enough.

+fi
+
+echo -n "{
    'qual_ids': set([\"${FLAGS_board}\"]),
-   'factory_image': 'rootfs-test.gz',
+   'factory_image': '"$subfolder"rootfs-test.gz',

[Nick Sanders, 2010/10/22 18:06:08]

Can you add curly braces around ${subfolder}

    'factory_checksum': '${test_hash}',
-   'release_image': 'rootfs-release.gz',
+   'release_image': '"$subfolder"rootfs-release.gz',
    'release_checksum': '${release_hash}',
-   'oempartitionimg_image': 'oem.gz',
+   'oempartitionimg_image': '"$subfolder"oem.gz',
    'oempartitionimg_checksum': '${oem_hash}',
-   'efipartitionimg_image': 'efi.gz',
+   'efipartitionimg_image': '"$subfolder"efi.gz',
    'efipartitionimg_checksum': '${efi_hash}',
-   'stateimg_image': 'state.gz',
-   'stateimg_checksum': '${state_hash}'," > ${OMAHA_DIR}/miniomaha.conf
+   'stateimg_image': '"$subfolder"state.gz',
+   'stateimg_checksum': '${state_hash}'," >> ${OMAHA_DIR}/miniomaha.conf
 
 if [ ! -z "${FLAGS_firmware_updater}" ]  ; then
   echo -n "
    'firmware_image': 'firmware.gz',
    'firmware_checksum': '${firmware_hash}'," >> ${OMAHA_DIR}/miniomaha.conf
 fi
 
 echo -n "
  },
 ]
 " >> ${OMAHA_DIR}/miniomaha.conf
 
 echo "The miniomaha server lives in src/platform/dev"
 echo "to validate the configutarion, run:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf \
 --validate_factory_config"
 echo "To run the server:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf"