diff options
| author | dcs <dcs@FreeBSD.org> | 2003-11-21 19:01:02 +0000 |
|---|---|---|
| committer | dcs <dcs@FreeBSD.org> | 2003-11-21 19:01:02 +0000 |
| commit | 6858333ecf3e7300a2b98ce666aec69f1b29db76 (patch) | |
| tree | c1f48f5f3cc4f71719b550229afa52b080d0d1ea | |
| parent | 9f3e95f4cd06206bd91aaa265bedaaed0967230d (diff) | |
| download | FreeBSD-src-6858333ecf3e7300a2b98ce666aec69f1b29db76.zip FreeBSD-src-6858333ecf3e7300a2b98ce666aec69f1b29db76.tar.gz | |
With the beastie menu a problem was introduced in which selecting a
different kernel to boot with kernel="NAME" would load the kernel and
loader.conf-selected modules from /boot/NAME, but it would not change
module_path. So, for instance, the automatically loaded acpi.ko would come
from /boot/kernel/acpi.ko, *always*.
Mind you, this happened for unassisted boot. If you interrupted, typed
"unload" and then "boot NAME", it would Do The Right Thing.
The source of the problem is the double initialization with beastie's
loader.rc. One would happen inside "start", and would load the kernel. The
next one would happen later in the loader.rc script, resetting module_path.
Because module_path is set to the Right Value by the functions in support.4th
that actually load the kernel, when beastie.4th proceeded to boot
module_path would remain wrong, as the kernel was already loaded.
This can be corrected by removing either initialization, and also by changing
the command used by beastie.4th from "boot" to "boot-conf", which makes sure
you use the right kernel and modules.
I chose to remove the second initialization, since this let you interrupt
(or confirm) boot before beastie even comes up. I avoid also doing the
boot-conf change because that would simply cause the kernel and modules to
be loaded twice (in fact, that was my original patch, until, in writing this
very commit message, I saw the error of my ways).
This commit changes the semantics of module loading when using the beastie
menu. Now it does what one would expect it to, but not what it was actually
doing, so something may break for unusual setups depending on broken
behavior. As our japanese friends so nicely put it, shikata ga nakatta. :-)
Approved by: re (scottl)
| -rw-r--r-- | sys/boot/i386/loader/loader.rc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc index 455c683..d650d99 100644 --- a/sys/boot/i386/loader/loader.rc +++ b/sys/boot/i386/loader/loader.rc @@ -13,8 +13,5 @@ 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 |
