CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-26 21:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: merge arguments in resize_fs

Browse Source
This commit is contained in:
Artem Smirnov
2018-06-05 17:57:36 +03:00
parent 8162357ce6
commit 83ce14e31b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image_builder/build.Jenkinsfile
View File

@@ -29,7 +29,7 @@ pipeline {
SIZE = '7G'
}
steps {
sh "$WORKSPACE/image_builder/image_config.sh resize_fs $SIZE ${params.BUILD_DIR} ${params.IMAGE_NAME}"
sh "$WORKSPACE/image_builder/image_config.sh resize_fs ${params.BUILD_DIR}/${params.IMAGE_NAME} $SIZE"
}
}
stage('Initialize image') {

14
image_builder/image_config.sh
View File

@@ -32,7 +32,7 @@ get_image() {
resize_fs() {
# STATIC FUNCTION
# TEMPLATE: resize_fs $SIZE $BUILD_DIR $IMAGE_NAME
# TEMPLATE: resize_fs $IMAGE_PATH $SIZE
# Partitions numbers
local BOOT_PARTITION=1
@@ -58,16 +58,16 @@ resize_fs() {
# TODO: Check sfdisk exit code
echo -e "\033[0;31m\033[1mTruncate image\033[0m\033[0m" \
&& truncate -s$1 $2/$3 \
&& echo "Mount loop-image: $2/$3" \
&& local DEV_IMAGE=$(losetup -Pf $2/$3 --show) \
&& truncate -s$2 $1 \
&& echo "Mount loop-image: $1" \
&& local DEV_IMAGE=$(losetup -Pf $1 --show) \
&& sleep 0.5 \
&& echo -e "\033[0;31m\033[1mMount loop-image: $1\033[0m\033[0m" \
&& echo ", +" | sfdisk -N 2 $DEV_IMAGE \
&& sleep 0.5 \
&& losetup -d $DEV_IMAGE \
&& sleep 0.5 \
&& local DEV_IMAGE=$(losetup -Pf $2/$3 --show) \
&& local DEV_IMAGE=$(losetup -Pf $1 --show) \
&& sleep 0.5 \
&& echo -e "\033[0;31m\033[1mCheck & repair filesystem after expand partition\033[0m\033[0m" \
&& e2fsck -fvy "${DEV_IMAGE}p${ROOT_PARTITION}" \
@@ -393,8 +393,8 @@ case "$1" in
get_image $2 $3 $4;;
resize_fs)
# resize_fs $SIZE $BUILD_DIR $IMAGE_NAME
resize_fs $2 $3 $4 $5;;
# resize_fs $IMAGE_PATH $SIZE
resize_fs $2 $3;;
publish_image)
# publish_image $BUILD_DIR $IMAGE_NAME $YA_SCRIPT $CONFIG_FILE $RELEASE_ID $RELEASE_BODY