diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-06-15 14:07:16 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-06-15 14:07:16 +0000 |
| commit | e01ce27c8fd339bdbf551b86aa7a41a930bf773b (patch) | |
| tree | 388479f960eb6b82126e5ad5590aa0de1a6f18e6 /sys/boot | |
| parent | be13f04a4a26baad41c6615e19849208000612f0 (diff) | |
| download | FreeBSD-src-e01ce27c8fd339bdbf551b86aa7a41a930bf773b.zip FreeBSD-src-e01ce27c8fd339bdbf551b86aa7a41a930bf773b.tar.gz | |
Revert changes to this file in r222417. This unconditionally enabled the
boot menu on all platforms, which breaks loader completely on at least
powerpc for reasons that are not understood yet.
Reviewed by: Devin Teske
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/forth/loader.rc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc index 6443f3f..0f9d37e 100644 --- a/sys/boot/forth/loader.rc +++ b/sys/boot/forth/loader.rc @@ -10,8 +10,5 @@ start \ Tests for password -- executes autoboot first if a password was defined check-password -\ Load in the boot menu -include /boot/beastie.4th +\ Unless set otherwise, autoboot is automatic at this point -\ Start the boot menu -beastie-start |
