[src/netbsd-2-0]: src/distrib/acorn32/stand/BtNetBSD/!BtNetBSD Pull up revisi...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb41d70b4f08
branches:  netbsd-2-0
changeset: 561431:bb41d70b4f08
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jun 17 08:35:16 2004 +0000

description:
Pull up revision 1.8 (requested by abs in ticket #497):
Finish conversion from old bootloader - remove command line options that boot32
will not understand

diffstat:

 distrib/acorn32/stand/BtNetBSD/!BtNetBSD/fastboot |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r c0aeb2e543a4 -r bb41d70b4f08 distrib/acorn32/stand/BtNetBSD/!BtNetBSD/fastboot
--- a/distrib/acorn32/stand/BtNetBSD/!BtNetBSD/fastboot Thu Jun 17 08:33:47 2004 +0000
+++ b/distrib/acorn32/stand/BtNetBSD/!BtNetBSD/fastboot Thu Jun 17 08:35:16 2004 +0000
@@ -1,4 +1,4 @@
-| $NetBSD: fastboot,v 1.5.2.2 2004/06/17 08:28:44 tron Exp $
+| $NetBSD: fastboot,v 1.5.2.3 2004/06/17 08:35:16 tron Exp $
 |
 | Fast boot configuration file, edit by hand, save and run !BtNetBSD
 | Part of !BtNetBSD
@@ -22,9 +22,13 @@
 |
 | XXX UnixFS is currently broken.
 |If "%*0" = "" Then Set NetBSD$Kernel UnixFS:$.netbsd Else Set NetBSD$Kernel %*0
+|Set NetBSD$Root /dev/wd0a
+|Set NetBSD$BootOptions root=<NetBSD$Root> maxproc=64 noftp symtab
 If "%*0" = "" Then Error Double click a kernel to start NetBSD
-Set NetBSD$Root /dev/wd0a
-Set NetBSD$BootOptions maxproc=64 noftp symtab
+Set NetBSD$Kernel %*0
+
+| Clear incompatible boot options an older version of !BtNetBSD may have set
+UnSet NetBSD$BootOptions
 
 | Set WimpSlot (suit as you like ... to little won't boot correctly)
 *Wimpslot 7000k
@@ -38,6 +42,6 @@
 If "<NetBSD$ScreenMode>" <> "" Then Set Alias$SetNetBSDMode Wimpmode <NetBSD$ScreenMode>
 If "<NetBSD$ScreenMode>" <> "" Then SetNetBSDMode
 
-Set Alias$RunNetBSD <BtNetBSD$Dir>.boot32 <NetBSD$Kernel> root=<NetBSD$Root> <NetBSD$BootOptions>
+Set Alias$RunNetBSD <BtNetBSD$Dir>.boot32 <NetBSD$Kernel> <NetBSD$BootOptions>
 
 RunNetBSD