summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-09-28 13:38:39 -0300
committerRenato Botelho <renato@netgate.com>2017-09-28 13:38:39 -0300
commit286ec1c74c05ad11dd3c561b955405849d8d5619 (patch)
tree593a4a3c331941984b10cbbb2dda7fa023ed5386 /tools
parentc56630d7b33c36542f5afb9fc13b56e69711a16c (diff)
downloadpfsense-286ec1c74c05ad11dd3c561b955405849d8d5619.zip
pfsense-286ec1c74c05ad11dd3c561b955405849d8d5619.tar.gz
Set kern.cam.boot_delay=10000 on target systems installed using memstick or ISO
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index fbdd872..1fd8d7d 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -787,6 +787,7 @@ create_iso_image() {
rm -f ${LOADERCONF} ${BOOTCONF} >/dev/null 2>&1
echo 'autoboot_delay="3"' > ${LOADERCONF}
+ echo 'kern.cam.boot_delay=10000' >> ${LOADERCONF}
cat ${LOADERCONF} > ${FINAL_CHROOT_DIR}/boot/loader.conf
create_distribution_tarball
@@ -831,7 +832,6 @@ create_memstick_image() {
install_default_kernel ${DEFAULT_KERNEL}
echo ">>> Creating memstick to ${_image_path}." 2>&1 | tee -a ${LOGFILE}
- echo "kern.cam.boot_delay=10000" >> ${INSTALLER_CHROOT_DIR}/boot/loader.conf.local
BOOTCONF=${INSTALLER_CHROOT_DIR}/boot.config
LOADERCONF=${INSTALLER_CHROOT_DIR}/boot/loader.conf
@@ -839,6 +839,7 @@ create_memstick_image() {
rm -f ${LOADERCONF} ${BOOTCONF} >/dev/null 2>&1
echo 'autoboot_delay="3"' > ${LOADERCONF}
+ echo 'kern.cam.boot_delay=10000' >> ${LOADERCONF}
cat ${LOADERCONF} > ${FINAL_CHROOT_DIR}/boot/loader.conf
create_distribution_tarball
@@ -871,7 +872,6 @@ create_memstick_serial_image() {
install_default_kernel ${DEFAULT_KERNEL}
echo ">>> Creating serial memstick to ${MEMSTICKSERIALPATH}." 2>&1 | tee -a ${LOGFILE}
- echo "kern.cam.boot_delay=10000" >> ${INSTALLER_CHROOT_DIR}/boot/loader.conf.local
BOOTCONF=${INSTALLER_CHROOT_DIR}/boot.config
LOADERCONF=${INSTALLER_CHROOT_DIR}/boot/loader.conf
@@ -881,6 +881,7 @@ create_memstick_serial_image() {
# Activate serial console+video console in loader.conf
echo 'autoboot_delay="3"' > ${LOADERCONF}
+ echo 'kern.cam.boot_delay=10000' >> ${LOADERCONF}
echo 'boot_multicons="YES"' >> ${LOADERCONF}
echo 'boot_serial="YES"' >> ${LOADERCONF}
echo 'console="comconsole,vidconsole"' >> ${LOADERCONF}
@@ -919,7 +920,6 @@ create_memstick_adi_image() {
install_default_kernel ${DEFAULT_KERNEL}
echo ">>> Creating serial memstick to ${MEMSTICKADIPATH}." 2>&1 | tee -a ${LOGFILE}
- echo "kern.cam.boot_delay=10000" >> ${INSTALLER_CHROOT_DIR}/boot/loader.conf.local
BOOTCONF=${INSTALLER_CHROOT_DIR}/boot.config
LOADERCONF=${INSTALLER_CHROOT_DIR}/boot/loader.conf
@@ -929,6 +929,7 @@ create_memstick_adi_image() {
# Activate serial console+video console in loader.conf
echo 'autoboot_delay="3"' > ${LOADERCONF}
+ echo 'kern.cam.boot_delay=10000' >> ${LOADERCONF}
echo 'boot_serial="YES"' >> ${LOADERCONF}
echo 'console="comconsole"' >> ${LOADERCONF}
echo 'comconsole_speed="115200"' >> ${LOADERCONF}
OpenPOWER on IntegriCloud