From owner-cvs-all Sun Mar 8 20:50:57 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id UAA25271 for cvs-all-outgoing; Sun, 8 Mar 1998 20:50:57 -0800 (PST) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA25258; Sun, 8 Mar 1998 20:50:55 -0800 (PST) (envelope-from msmith@FreeBSD.org) From: Michael Smith Received: (from msmith@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id UAA05548; Sun, 8 Mar 1998 20:48:57 -0800 (PST) Date: Sun, 8 Mar 1998 20:48:57 -0800 (PST) Message-Id: <199803090448.UAA05548@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG Subject: cvs commit: src/sys/i386/i386 autoconf.c src/sys/sys reboot.h Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk msmith 1998/03/08 20:48:57 PST Modified files: (Branch: RELENG_2_2) sys/i386/i386 autoconf.c sys/sys reboot.h Log: Merge from -current: use the slice number passed in from the bootloader to correctly locate the FreeBSD slice we are booting from. Also make more use of the macros in reboot.h, and add an extra one to obtain the slice number. Revision Changes Path 1.56.2.9 +10 -8 src/sys/i386/i386/autoconf.c 1.14.2.1 +4 -1 src/sys/sys/reboot.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message