summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2003-05-31 05:25:18 +0000
committerscottl <scottl@FreeBSD.org>2003-05-31 05:25:18 +0000
commit340f6115ced94734378a46300e6fdc887146fa2e (patch)
tree2fadfa48f2d3e79fc7bf57e0a65fc907b0718f34 /sys/boot
parent716d37783dec9861538f49d39809d26ee18d0cd4 (diff)
downloadFreeBSD-src-340f6115ced94734378a46300e6fdc887146fa2e.zip
FreeBSD-src-340f6115ced94734378a46300e6fdc887146fa2e.tar.gz
Enable the new bootloader for i386 only. The new loader.rc is will only
be installed if an old one does not exist, i.e. only during install, not during upgrades. Approved by: re
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/loader/Makefile2
-rw-r--r--sys/boot/i386/loader/loader.rc20
2 files changed, 21 insertions, 1 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index e944e5e..b92fcd6 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -106,7 +106,7 @@ FILES+= screen.4th frames.4th beastie.4th
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
+FILES+= ${.CURDIR}/loader.rc
.endif
.include <${.CURDIR}/../Makefile.inc>
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc
new file mode 100644
index 0000000..455c683
--- /dev/null
+++ b/sys/boot/i386/loader/loader.rc
@@ -0,0 +1,20 @@
+\ Loader.rc
+\ $FreeBSD$
+\
+\ Includes additional commands
+include /boot/loader.4th
+
+\ Reads and processes loader.rc
+start
+
+\ Tests for password -- executes autoboot first if a password was defined
+check-password
+
+\ Load in the boot menu
+include /boot/beastie.4th
+
+\ Do the normal initialization and startup
+initialize drop
+
+\ Start the boot menu
+beastie-start
OpenPOWER on IntegriCloud