diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-02 16:07:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-02 16:08:31 -0300 |
| commit | 9dcb68a4819b21e5d7bfb5db8cd866e6b3a0fbe1 (patch) | |
| tree | 6b89439a33f72378134faa9cb1d1f86ec60d3efb /tools/builder_common.sh | |
| parent | db96a95c57327eb6591ae40cac3e60b3510b7b22 (diff) | |
| download | pfsense-9dcb68a4819b21e5d7bfb5db8cd866e6b3a0fbe1.zip pfsense-9dcb68a4819b21e5d7bfb5db8cd866e6b3a0fbe1.tar.gz | |
Do not set loader.conf on nanobsd-vga
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index a34b66b..2f419dd 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -544,18 +544,18 @@ create_nanobsd_diskimage () { if [ "${1}" = "nanobsd" ]; then # Tell loader to use serial console early. echo "-S115200 -h" >> ${BOOTCONF} - fi - # Remove old console options if present. - [ -f "${LOADERCONF}" ] \ - && sed -i "" -Ee "/(console|boot_multicons|boot_serial|hint.uart)/d" ${LOADERCONF} - # Activate serial console+video console in loader.conf - echo 'autoboot_delay="5"' >> ${LOADERCONF} - echo 'loader_color="NO"' >> ${LOADERCONF} - echo 'beastie_disable="YES"' >> ${LOADERCONF} - echo 'boot_serial="YES"' >> ${LOADERCONF} - echo 'console="comconsole"' >> ${LOADERCONF} - echo 'comconsole_speed="115200"' >> ${LOADERCONF} + # Remove old console options if present. + [ -f "${LOADERCONF}" ] \ + && sed -i "" -Ee "/(console|boot_multicons|boot_serial|hint.uart)/d" ${LOADERCONF} + # Activate serial console+video console in loader.conf + echo 'autoboot_delay="5"' >> ${LOADERCONF} + echo 'loader_color="NO"' >> ${LOADERCONF} + echo 'beastie_disable="YES"' >> ${LOADERCONF} + echo 'boot_serial="YES"' >> ${LOADERCONF} + echo 'console="comconsole"' >> ${LOADERCONF} + echo 'comconsole_speed="115200"' >> ${LOADERCONF} + fi for _NANO_MEDIASIZE in ${2}; do if [ -z "${_NANO_MEDIASIZE}" ]; then |
