From owner-cvs-all Fri Sep 8 9:47: 8 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A3D1A37B42C; Fri, 8 Sep 2000 09:47:05 -0700 (PDT) Received: (from dcs@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA07884; Fri, 8 Sep 2000 09:47:05 -0700 (PDT) (envelope-from dcs@FreeBSD.org) Message-Id: <200009081647.JAA07884@freefall.freebsd.org> From: "Daniel C. Sobral" Date: Fri, 8 Sep 2000 09:47:05 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/boot/common boot.c module.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG dcs 2000/09/08 09:47:05 PDT Modified files: sys/boot/common boot.c module.c Log: Fix autoboot. Now autoboot *always* show the correct kernel name. It gets the name from the environment variable kernelname, which is set when a kernel is loaded. For this reason, autoboot will _first_ try to load a kernel, and only proceed with the wait prompt after that succeeds. If it fails, it will abort immediately. While I understand some may think this behavior undesirable, I think it is, overall, the best thing to do, even if we do not consider the aesthetic issue. Notice that anyone using the default loader.rc already has the kernel loaded before autoboot. On unload, unset kernelname. Separate the code that tries to load a kernel from the list of options to the function loadakernel(). It is used by both boot() and autoboot(). Revision Changes Path 1.24 +37 -18 src/sys/boot/common/boot.c 1.17 +2 -1 src/sys/boot/common/module.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message