cvs commit: src/sys/boot/i386/loader loader.rc

[Daniel C. Sobral]

Dag-Erling Smørgrav wrote:
> "Daniel C. Sobral" <dcs at FreeBSD.org> writes:
> 
>>  Log:
>>  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*.
> 
> Thanks for fixing this.  Unfortunately, loader.rc is only installed if
> it doesn't already exist, and mergemaster doesn't handle it, so
> installed systems need to be fixed manually.  Is there something we
> can do to the Makefile and / or mergemaster to address this?

There have been many discussions around this subject before. The problem 
is that /boot/loader.rc is deemed to be untouchable, so the solutions I 
support won't handle this particular problem. I'd like to have 
/boot/defaults/loader.rc to be loaded _if_ a /boot/loader.rc can't be 
found, and only install that file. That would solve this kind of 
situation in the future, but not now.

I suggest a note in UPDATING. I can't see what more we could do.

-- 
Daniel C. Sobral			(8-DCS)

dcs at newsguy.com
dcs at freebsd.org
capo at banana.bsdconspiracy.net

	I'd like to work for something named "Alcohol, Tobacco and Firearms".