summaryrefslogtreecommitdiffstats
path: root/sys/boot/alpha
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2000-07-10 16:52:42 +0000
committerjhb <jhb@FreeBSD.org>2000-07-10 16:52:42 +0000
commit41134498c4157c993891a71d8970e1b77fd14574 (patch)
treef6c8d92c18068a8ad40f3b685032923fa65ce2d9 /sys/boot/alpha
parent3dbed00e16fedae108e761b9a44758af1ebf9c12 (diff)
downloadFreeBSD-src-41134498c4157c993891a71d8970e1b77fd14574.zip
FreeBSD-src-41134498c4157c993891a71d8970e1b77fd14574.tar.gz
Always install loader.4th, defaults/loader.conf, and support.4th instead of
only doing so if loader.rc does not exist. This fixes the problem where installworld doesn't update /boot/loader.4th, resulting in device.hints not being loaded after updating past the config(8) changes, which resulted in mcclock0 not being probed, and a nice kernel panic during boot.
Diffstat (limited to 'sys/boot/alpha')
-rw-r--r--sys/boot/alpha/common/Makefile.common2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index 4e7c781..52b113a 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -74,13 +74,13 @@ beforeinstall:
.if !exists(${DESTDIR}/boot/loader.rc)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot
+.endif
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults
-.endif
start.o: ${.CURDIR}/../libalpha/start.S
OpenPOWER on IntegriCloud