diff --git a/build_image b/build_image index 32eb1caf61..ed8ed5d2be 100755 --- a/build_image +++ b/build_image @@ -158,10 +158,7 @@ fi if should_build_image ${COREOS_PRODUCTION_IMAGE_NAME}; then copy_image ${CHROMEOS_BASE_IMAGE_NAME} ${COREOS_PRODUCTION_IMAGE_NAME} - - setup_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} \ - ${SRC_ROOT}/third_party/coreos-overlay/coreos-base/coreos-au-key/files/update-payload-key.pub.pem - + setup_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} upload_image "${BUILD_DIR}/${COREOS_PRODUCTION_IMAGE_NAME}" fi diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh index 0c8417fa30..66b1a44662 100755 --- a/build_library/prod_image_util.sh +++ b/build_library/prod_image_util.sh @@ -6,26 +6,14 @@ setup_prod_image() { local image_name="$1" local disk_layout="$2" - local au_key="$3" info "Configuring production image ${image_name}" local root_fs_dir="${BUILD_DIR}/rootfs" - local enable_rootfs_verification_flag=--noenable_rootfs_verification - if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then - enable_rootfs_verification_flag=--enable_rootfs_verification - fi "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \ mount "${BUILD_DIR}/${image_name}" "${root_fs_dir}" trap "cleanup_mounts '${root_fs_dir}' && delete_prompt" EXIT - # Install an auto update key on the root before sealing it off - local key_location=${root_fs_dir}"/usr/share/update_engine/" - sudo mkdir -p "${key_location}" - sudo cp "${au_key}" "$key_location/update-payload-key.pub.pem" - sudo chown root:root "$key_location/update-payload-key.pub.pem" - sudo chmod 644 "$key_location/update-payload-key.pub.pem" - # clean-ups of things we do not need sudo rm ${root_fs_dir}/etc/csh.env sudo rm -rf ${root_fs_dir}/var/db/pkg