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

Save parameter in local variable

Browse Source
This commit is contained in:
Renato Botelho 2016-02-29 16:23:21 -03:00
parent 191136b34a
commit b2fbacdc38
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/builder_common.sh
View File

@ -1172,13 +1172,15 @@ create_final_staging_area() {
}
customize_stagearea_for_image() {
local _image_type="$1"
# Prepare final stage area
create_final_staging_area
pkg_chroot_add ${FINAL_CHROOT_DIR} rc
if [ "${1}" = "nanobsd" -o \
"${1}" = "nanobsd-vga" ]; then
if [ "${_image_type}" = "nanobsd" -o \
"${_image_type}" = "nanobsd-vga" ]; then
mkdir -p ${FINAL_CHROOT_DIR}/root/var/db \
${FINAL_CHROOT_DIR}/root/var/cache \
@ -1200,20 +1202,20 @@ customize_stagearea_for_image() {
pkg_chroot_add ${FINAL_CHROOT_DIR} repo-devel
fi
if [ "${1}" = "iso" -o \
"${1}" = "memstick" -o \
"${1}" = "memstickserial" -o \
"${1}" = "memstickadi" ]; then
if [ "${_image_type}" = "iso" -o \
"${_image_type}" = "memstick" -o \
"${_image_type}" = "memstickserial" -o \
"${_image_type}" = "memstickadi" ]; then
install_bsdinstaller
mkdir -p ${FINAL_CHROOT_DIR}/pkgs
cp ${CORE_PKG_REAL_PATH}/All/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs
fi
if [ "${1}" = "nanobsd" -o \
"${1}" = "memstickserial" -o \
"${1}" = "memstickadi" ]; then
if [ "${_image_type}" = "nanobsd" -o \
"${_image_type}" = "memstickserial" -o \
"${_image_type}" = "memstickadi" ]; then
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-serial
elif [ "${1}" = "ova" ]; then
elif [ "${_image_type}" = "ova" ]; then
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-vmware
else
pkg_chroot_add ${FINAL_CHROOT_DIR} default-config