From owner-cvs-all@FreeBSD.ORG  Fri Nov 21 14:33:23 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E0D8916A4EB; Fri, 21 Nov 2003 14:33:23 -0800 (PST)
Received: from smtp.des.no (flood.des.no [217.116.83.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2D1BF43FAF; Fri, 21 Nov 2003 14:33:19 -0800 (PST)
	(envelope-from des@des.no)
Received: by smtp.des.no (Pony Express, from userid 666)
	id BDCC85309; Fri, 21 Nov 2003 23:33:17 +0100 (CET)
Received: from dwp.des.no (des.no [80.203.228.37])
	by smtp.des.no (Pony Express) with ESMTP
	id DB2805308; Fri, 21 Nov 2003 23:33:09 +0100 (CET)
Received: by dwp.des.no (Postfix, from userid 2602)
	id 6549733C86; Fri, 21 Nov 2003 23:33:09 +0100 (CET)
To: "Daniel C. Sobral" <dcs@FreeBSD.org>
References: <200311211901.hALJ12uN003276@repoman.freebsd.org>
From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=)
Date: Fri, 21 Nov 2003 23:33:09 +0100
In-Reply-To: <200311211901.hALJ12uN003276@repoman.freebsd.org> (Daniel C.
 Sobral's message of "Fri, 21 Nov 2003 11:01:02 -0800 (PST)")
Message-ID: <xzp4qwxtkre.fsf@dwp.des.no>
User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on 
	flood.des.no
X-Spam-Level: ss
X-Spam-Status: No, hits=2.5 required=5.0 tests=RCVD_IN_DYNABLOCK autolearn=no 
	version=2.60
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/boot/i386/loader loader.rc
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2003 22:33:24 -0000

"Daniel C. Sobral" <dcs@FreeBSD.org> writes:
>   Log:
>   With the beastie menu a problem was introduced in which selecting a
>   different kernel to boot with kernel=3D"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 c=
ome
>   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?

DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no