mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to chose custom default-config package on customize_stagearea_for_image()

Browse Source
This commit is contained in:
Renato Botelho 2016-02-29 16:27:16 -03:00
parent b2fbacdc38
commit 75e282959f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/builder_common.sh
View File

@ -1173,6 +1173,19 @@ create_final_staging_area() {
customize_stagearea_for_image() {
local _image_type="$1"
local _default_config=""
if [ -n "$2" ]; then
_default_config="$2"
elif [ "${_image_type}" = "nanobsd" -o \
"${_image_type}" = "memstickserial" -o \
"${_image_type}" = "memstickadi" ]; then
_default_config="default-config-serial"
elif [ "${_image_type}" = "ova" ]; then
_default_config="default-config-vmware"
else
_default_config="default-config"
fi
# Prepare final stage area
create_final_staging_area
@ -1211,15 +1224,7 @@ customize_stagearea_for_image() {
cp ${CORE_PKG_REAL_PATH}/All/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs
fi
if [ "${_image_type}" = "nanobsd" -o \
"${_image_type}" = "memstickserial" -o \
"${_image_type}" = "memstickadi" ]; then
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-serial
elif [ "${_image_type}" = "ova" ]; then
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-vmware
else
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config
fi
pkg_chroot_add ${FINAL_CHROOT_DIR} ${_default_config}
}
create_distribution_tarball() {