From 9ddd4a63bbf9d26e48b023df22a792b3a8b55044 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 17 Aug 2018 22:43:00 +0300 Subject: [PATCH] image_builder: add cp address support --- image_builder/image_config.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh index fee28743..32dbd08a 100755 --- a/image_builder/image_config.sh +++ b/image_builder/image_config.sh @@ -173,16 +173,14 @@ copy_to_chroot() { mount "${DEV_IMAGE}p${ROOT_PARTITION}" ${MOUNT_POINT} mount "${DEV_IMAGE}p${BOOT_PARTITION}" ${MOUNT_POINT}/boot - echo -e "\033[0;31m\033[1m$(date) | Enter chroot\033[0m\033[0m" - file_name=$(basename $2) - file_path_root="${MOUNT_POINT}$3/${file_name}" - # Copy script into chroot fs - # TODO: Find more suitable location for temporary script storage - if [ ! -d ${file_path_root} ] ; then - mkdir -p ${file_path_root} \ - && echo "Created ${file_path_root}" + dir_name=$(dirname "${MOUNT_POINT}$3 /") + if [ ! -d ${dir_name} ] ; then + mkdir -p ${dir_name} \ + && echo "Created ${dir_name}" fi - cp "$2" "${file_path_root}" + + # Copy script into chroot fs + cp -r "$2" "${MOUNT_POINT}$3" umount_system ${MOUNT_POINT} ${DEV_IMAGE} }