diff options
Diffstat (limited to 'create_arm_image.sh')
| -rwxr-xr-x | create_arm_image.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index 25f8e2b..01625b8 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -166,7 +166,8 @@ while true; do shift ;; --desktop) - DESKTOP="task-${2}" + DESKTOP="${2}" + DESKTOP_TASK="task-${DESKTOP}" shift 2 ;; -h|--help) @@ -266,6 +267,8 @@ else fi # VARIABLE_A=${VARIABLE_B_IF_EXISTS:=${VARIABLE_C_IF_B_DOESNT_EXISTS}} +IMAGE_SIZE=2 #Set a default size in case it is missing. +#Redefined priority : commandline, then specific board config file. IMAGE_SIZE="${IMAGE_SIZE_P:=${IMAGE_SIZE}}" INSTALL_PATH="${INSTALL_PATH_P:=${INSTALL_PATH}}" TARGET="${TARGET_P:=${TARGET}}" @@ -274,6 +277,10 @@ BOOTFS="${BOOTFS_P:=${BOOTFS}}" NONFREE="${NONFREE_P:=0}" TAINTED="${TAINTED_P:=0}" +#name of the image +DESKTOP_NAME="${DESKTOP:="noDE"}" +IMAGE_BASE="Mageia-${MAGEIA_VERSION}-${TARGET}" +IMAGE="${IMAGE_BASE}-${DESKTOP_NAME}.img" info "Option: "${OPT} @@ -296,11 +303,6 @@ info "Firmware path : ${FIRMWARE_PATH}" info "Firmware dir : ${FIRMWARE_DIR}" info "Installation method : ${INSTALL_METHOD}" -# Defining default image size to 7 go -# if [[ "${IMAGE_SIZE}" -lt 2 ]] || [[ "${IMAGE_SIZE}" -gt 128 ]]; then -# IMAGE_SIZE=7 -# fi - # change dir to install path and create it if not existing if [ "${OPT}" != "clean" ]; then info "cd ${INSTALL_PATH}" @@ -323,6 +325,7 @@ OPT=${OPT:="--help"} info "Image size is: ${IMAGE_SIZE} GB" + case ${OPT} in "clean") clean |