CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-29 22:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: fix bugs

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-24 19:31:36 +03:00
parent 72b20f8c94
commit fa817d9f80
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
builder_docker/image-chroot.sh
View File

@@ -85,23 +85,16 @@ execute() {
|| (echo_stamp "Failed" "ERROR"; exit 1)
if [[ $# > 1 ]]; then
echo_stamp "Copy script into chroot fs"
echo_stamp "Copy script to chroot fs"
local SCRIPT_NAME=$(basename $2)
local SCRIPT_PATH="$(mktemp -d -p ${MOUNT_POINT}/tmp --suffix=.tmp_builder_script)"
local SCRIPT_NAME="$(tr -dc 'A-F0-9' < /dev/urandom | dd bs=1 count=16 2>/dev/null)"
local SCRIPT_DIR="${MOUNT_POINT}/root"
local script_name=$(basename $2)
local script_path_root="${MOUNT_POINT}/root/${script_name}"
# TODO: maybe copy to tmp-dir
# TODO: Find more suitable location for temporary script storage
# $(mktemp -p ${MOUNT_POINT}/tmp --suffix=.tmp_builder_script)
cp "$2" "${script_path_root}"
cp "$2" "${SCRIPT_DIR}/${SCRIPT_NAME}"
# Run script in chroot with additional arguments
chroot ${MOUNT_POINT} /bin/sh -c "/root/${script_name} ${@:3}"
chroot ${MOUNT_POINT} /bin/sh -c "/root/${SCRIPT_NAME} ${@:3}"
# Removing script from chroot fs
rm "${script_path_root}"
rm "${SCRIPT_DIR}/${SCRIPT_NAME}"
else
# https://wiki.archlinux.org/index.php/Change_root_(%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9)
# http://www.unix-lab.org/posts/chroot/
@@ -162,14 +155,14 @@ if [ $(whoami) != "root" ]; then
exit 1
fi
echo "================================================================================"
for ((i=0; i<=$#; i++)); do echo "\$$i: ${!i}"; done
echo "================================================================================"
if [[ $# > 0 ]]; then
echo "================================================================================"
for ((i=1; i<=$#; i++)); do echo "\$$i: ${!i}"; done
echo "================================================================================"
[[ -f $1 ]] || (echo_stamp "$1 does not exist" "ERROR"; echo "Template: image-chroot.sh <IMAGE> [ exec <SCRIPT> [...] | copy <MOVE_FILE> <MOVE_TO> ]"; exit 1)
[[ -f $1 ]] || (echo_stamp "$1 does not exist" "ERROR"; exit 1)
if [[ -z $2 ]] && [[ -f $3 ]]; then
if [[ ! -z $2 && -f $3 ]]; then
case "$2" in
exec)
execute $1 $3 ${@:4};;

2
builder_docker/image-resize.sh
View File

@@ -190,7 +190,7 @@ if [[ $# > 0 ]]; then
[[ -f $1 ]] || (echo_bold "$1 does not exist" "ERROR"; exit 1)
if [[ -z $2 ]]; then
if [[ ! -z $2 ]]; then
case "$2" in
min)
shrink_free_space $1 $3;;