@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf - config_iso_url + [ -n "${iso_url_file}" ] && config_iso_url
How about check this in the config_iso_url?
Good point! -------- Thanks Yu Chuan
Thanks, Xueliang
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..." - local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2" + local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}" @@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}" + [ -n "${iso_url_file}" ] && { + mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild" - cd "${ROOTFS_LOCAL_PATH}" && - rm -f "${soft_link}" && - ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}" + local soft_link="${iso_version}-dailybuild" + cd "${ROOTFS_LOCAL_PATH}" && + rm -f "${soft_link}" && + ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}" + }
cd / && umount "${ROOTFS_LOCAL_PATH}"
-- 2.23.0