diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-02 08:23:15 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-02 10:55:35 -0300 |
| commit | b034785d30f0ad2015d13bae5de9eaadf6065755 (patch) | |
| tree | 24fb919fd7e64089671cbaf2da696fbd0102d9f1 /tools | |
| parent | bf19eec78a2ac5321018b61678b6365db1623432 (diff) | |
| download | pfsense-b034785d30f0ad2015d13bae5de9eaadf6065755.zip pfsense-b034785d30f0ad2015d13bae5de9eaadf6065755.tar.gz | |
Stop using memory disks for staging and final dir
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 56 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 3 |
2 files changed, 0 insertions, 59 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 14dd986..e3e07d7 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -197,62 +197,6 @@ print_error_pfS() { exit 1 } -prestage_on_ram_setup() { - # Do not use memory disks for release build - if [ -n "${_IS_RELEASE}" ]; then - return - fi - - [ -d "${STAGE_CHROOT_DIR}" ] \ - || mkdir -p ${STAGE_CHROOT_DIR} - [ -d "${FINAL_CHROOT_DIR}" ] \ - || mkdir -p ${FINAL_CHROOT_DIR} - - _AVAIL_MEM=$(($(sysctl -n hw.usermem) / 1024 / 1024)) - if [ $_AVAIL_MEM -lt 2000 ]; then - echo ">>> Builder has less than 2GiB RAM skipping memory disks" - return - else - echo "######################################################################################" - echo - echo ">>> Builder has more than 2GiB RAM enabling memory disks" - echo ">>> WARNING: Remember to remove these memory disks by running $0 --disable-memorydisks" - echo - echo "######################################################################################" - fi - - if df /dev/ufs/prestagebacking >/dev/null 2>&1; then - echo ">>> Detected preexisting memory disk enabled for ${STAGE_CHROOT_DIR}." - else - mdconfig -a -t swap -u 10001 -s ${MEMORYDISK_SIZE} - newfs -L prestagebacking -U /dev/md10001 - mount /dev/ufs/prestagebacking ${STAGE_CHROOT_DIR} - fi - - if df /dev/ufs/finalstagebacking >/dev/null 2>&1; then - echo ">>> Detected preexisting memory disk enabled for ${FINAL_CHROOT_DIR}." - else - mdconfig -a -t swap -u 10002 -s ${MEMORYDISK_SIZE} - newfs -L finalstagebacking -U /dev/md10002 - mount /dev/ufs/finalstagebacking ${FINAL_CHROOT_DIR} - fi -} - -prestage_on_ram_cleanup() { - if [ -c /dev/md10001 ]; then - if [ -d ${STAGE_CHROOT_DIR} ]; then - umount ${STAGE_CHROOT_DIR} - fi - mdconfig -d -u 10001 - fi - if [ -c /dev/md10002 ]; then - if [ -d ${FINAL_CHROOT_DIR} ]; then - umount ${FINAL_CHROOT_DIR} - fi - mdconfig -d -u 10002 - fi -} - # This routine will verify that the kernel has been # installed OK to the staging area. ensure_kernel_exists() { diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 057f25e..12639e9 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -200,9 +200,6 @@ export STAGE_CHROOT_DIR=${STAGE_CHROOT_DIR:-"${SCRATCHDIR}/stage-dir"} # iso staging area. export FINAL_CHROOT_DIR=${FINAL_CHROOT_DIR:-"${SCRATCHDIR}/final-dir"} -# 400M is not enough for amd64 -export MEMORYDISK_SIZE=${MEMORYDISK_SIZE:-"1024M"} - # OVF/vmdk parms # Name of ovf file included inside OVA archive export OVFTEMPLATE=${OVFTEMPLATE:-"${BUILDER_TOOLS}/templates/ovf/${PRODUCT_NAME}.ovf"} |
