diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-07 10:49:18 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-07 14:39:41 -0300 |
| commit | b74f5074d125d8600d7f1bba541044c6b63ab4de (patch) | |
| tree | 25c1314d314da24c374ab0cf8677d13c23af7b19 /tools | |
| parent | 5cd364305914ee17199f4fc6570919b72c0d177e (diff) | |
| download | pfsense-b74f5074d125d8600d7f1bba541044c6b63ab4de.zip pfsense-b74f5074d125d8600d7f1bba541044c6b63ab4de.tar.gz | |
Use staging repo to install bsdinstaller on final area
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index b47463e..59f3e31 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1721,13 +1721,26 @@ install_pkg_install_ports() { } install_bsdinstaller() { + local _params="" + + # Use staging repo on RELEASE + if [ -n "${_IS_RELEASE}" ]; then + mkdir -p ${FINAL_CHROOT_DIR}/tmp/pkg-repo + cp -f ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} \ + ${FINAL_CHROOT_DIR}/tmp/pkg-repo + _params="--repo-conf-dir /tmp/pkg-repo " + fi + echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (starting)" - pkg_chroot ${FINAL_CHROOT_DIR} install -f bsdinstaller + pkg_chroot ${FINAL_CHROOT_DIR} ${_params}install -f bsdinstaller sed -i '' -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME}," \ -e "s,%%PRODUCT_VERSION%%,${PRODUCT_VERSION}," \ -e "s,%%ARCH%%,${TARGET}," \ ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense.lua \ ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense_rescue.lua + if [ -n "${_IS_RELEASE}" ]; then + rm -rf ${FINAL_CHROOT_DIR}/tmp/pkg-repo + fi echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (finished)" } |
