Author: delphij
Date: Fri Mar 26 01:30:53 2010
New Revision: 205662
URL: http://svn.freebsd.org/changeset/base/205662
Log:
Our boot loader is capable of booting both i386 and amd64 kernels so
call it "x86" instead of "i386".
Suggested by: jhb in response to Alexander Best's loader proposal
MFC after: 1 month
Modified:
head/sys/boot/i386/boot2/boot2.c
head/sys/boot/i386/gptboot/gptboot.c
head/sys/boot/i386/zfsboot/zfsboot.c
Modified: head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- head/sys/boot/i386/boot2/boot2.c Fri Mar 26 01:19:29 2010
(r205661)
+++ head/sys/boot/i386/boot2/boot2.c Fri Mar 26 01:30:53 2010
(r205662)
@@ -283,7 +283,7 @@ main(void)
for (;;) {
if (!autoboot || !OPT_CHECK(RBX_QUIET))
- printf("\nFreeBSD/i386 boot\n"
+ printf("\nFreeBSD/x86 boot\n"
"Default: %u:%s(%u,%c)%s\n"
"boot: ",
dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
Modified: head/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- head/sys/boot/i386/gptboot/gptboot.c Fri Mar 26 01:19:29 2010
(r205661)
+++ head/sys/boot/i386/gptboot/gptboot.c Fri Mar 26 01:30:53 2010
(r205662)
@@ -281,7 +281,7 @@ main(void)
for (;;) {
if (!autoboot || !OPT_CHECK(RBX_QUIET))
- printf("\nFreeBSD/i386 boot\n"
+ printf("\nFreeBSD/x86 boot\n"
"Default: %u:%s(%up%u)%s\n"
"boot: ",
dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- head/sys/boot/i386/zfsboot/zfsboot.c Fri Mar 26 01:19:29 2010
(r205661)
+++ head/sys/boot/i386/zfsboot/zfsboot.c Fri Mar 26 01:30:53 2010
(r205662)
@@ -730,7 +730,7 @@ main(void)
for (;;) {
if (!autoboot || !OPT_CHECK(RBX_QUIET))
- printf("\nFreeBSD/i386 boot\n"
+ printf("\nFreeBSD/x86 boot\n"
"Default: %s:%s\n"
"boot: ",
spa->spa_name, kname);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
