From 16d5f052751636e7657f2f326d0bf3e56b1d55b0 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 23 Jul 2018 17:06:51 -0700 Subject: [PATCH] build_image: rename dev_image to dev_container --- build_image | 4 ++-- build_library/{dev_image_util.sh => dev_container_util.sh} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename build_library/{dev_image_util.sh => dev_container_util.sh} (99%) diff --git a/build_image b/build_image index 0ee30b30fa..ca490b7bc1 100755 --- a/build_image +++ b/build_image @@ -106,7 +106,7 @@ fi . "${BUILD_LIBRARY_DIR}/board_options.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/build_image_util.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/prod_image_util.sh" || exit 1 -. "${BUILD_LIBRARY_DIR}/dev_image_util.sh" || exit 1 +. "${BUILD_LIBRARY_DIR}/dev_container_util.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/test_image_content.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/torcx_manifest.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/vm_image_util.sh" || exit 1 @@ -166,7 +166,7 @@ fix_mtab if [[ "${CONTAINER}" -eq 1 ]]; then IMAGE_BUILD_TYPE="container" - create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg} + create_dev_container "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg} fi if [[ "${PROD_IMAGE}" -eq 1 ]]; then diff --git a/build_library/dev_image_util.sh b/build_library/dev_container_util.sh similarity index 99% rename from build_library/dev_image_util.sh rename to build_library/dev_container_util.sh index 536bd1ec27..8a48829a78 100755 --- a/build_library/dev_image_util.sh +++ b/build_library/dev_container_util.sh @@ -54,7 +54,7 @@ EOF eselect profile set --force $(get_board_profile $BOARD)/dev } -create_dev_image() { +create_dev_container() { local image_name=$1 local disk_layout=$2 local update_group=$3