diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-14 13:03:01 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-14 13:03:01 -0200 |
| commit | 788f1c3bee47b409a357ec19750fb958a5397938 (patch) | |
| tree | d7f7f5da2790927434d21efa02e03e3e66fb5c68 /tools | |
| parent | b7355f6606428101e1960ae602a07fc47006c7dd (diff) | |
| download | pfsense-788f1c3bee47b409a357ec19750fb958a5397938.zip pfsense-788f1c3bee47b409a357ec19750fb958a5397938.tar.gz | |
Re-add autoboot_delay=3 to loader.conf. Fixes #7003
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 0183e13..36f4c39 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -739,8 +739,8 @@ create_iso_image() { LOADERCONF=${INSTALLER_CHROOT_DIR}/boot/loader.conf rm -f ${LOADERCONF} ${BOOTCONF} >/dev/null 2>&1 - - touch ${FINAL_CHROOT_DIR}/boot/loader.conf + echo 'autoboot_delay="3"' > ${LOADERCONF} + cat ${LOADERCONF} > ${FINAL_CHROOT_DIR}/boot/loader.conf create_distribution_tarball @@ -791,7 +791,8 @@ create_memstick_image() { rm -f ${LOADERCONF} ${BOOTCONF} >/dev/null 2>&1 - touch ${FINAL_CHROOT_DIR}/boot/loader.conf + echo 'autoboot_delay="3"' > ${LOADERCONF} + cat ${LOADERCONF} > ${FINAL_CHROOT_DIR}/boot/loader.conf create_distribution_tarball @@ -832,13 +833,14 @@ create_memstick_serial_image() { echo "-S115200 -D" > ${BOOTCONF} # Activate serial console+video console in loader.conf - echo 'boot_multicons="YES"' > ${LOADERCONF} + echo 'autoboot_delay="3"' > ${LOADERCONF} + echo 'boot_multicons="YES"' >> ${LOADERCONF} echo 'boot_serial="YES"' >> ${LOADERCONF} echo 'console="comconsole,vidconsole"' >> ${LOADERCONF} echo 'comconsole_speed="115200"' >> ${LOADERCONF} - cat ${BOOTCONF} >> ${FINAL_CHROOT_DIR}/boot.config - cat ${LOADERCONF} >> ${FINAL_CHROOT_DIR}/boot/loader.conf + cat ${BOOTCONF} > ${FINAL_CHROOT_DIR}/boot.config + cat ${LOADERCONF} > ${FINAL_CHROOT_DIR}/boot/loader.conf create_distribution_tarball @@ -879,7 +881,8 @@ create_memstick_adi_image() { echo "-S115200 -h" > ${BOOTCONF} # Activate serial console+video console in loader.conf - echo 'boot_serial="YES"' > ${LOADERCONF} + echo 'autoboot_delay="3"' > ${LOADERCONF} + echo 'boot_serial="YES"' >> ${LOADERCONF} echo 'console="comconsole"' >> ${LOADERCONF} echo 'comconsole_speed="115200"' >> ${LOADERCONF} echo 'comconsole_port="0x2F8"' >> ${LOADERCONF} |
