Author: delphij
Date: Tue Sep 7 18:14:59 2010
New Revision: 212301
URL: http://svn.freebsd.org/changeset/base/212301
Log:
MFC r205662 + r212066 (except efi part):
Our boot loader is capable of booting both i386 and amd64 kernels so
call it "x86" instead of "i386".
Modified:
stable/8/sys/boot/i386/boot2/boot2.c
stable/8/sys/boot/i386/gptboot/gptboot.c
stable/8/sys/boot/i386/loader/Makefile
stable/8/sys/boot/i386/zfsboot/zfsboot.c
stable/8/sys/boot/i386/zfsloader/Makefile
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/boot/i386/boot2/boot2.c
==============================================================================
--- stable/8/sys/boot/i386/boot2/boot2.c Tue Sep 7 18:14:50 2010
(r212300)
+++ stable/8/sys/boot/i386/boot2/boot2.c Tue Sep 7 18:14:59 2010
(r212301)
@@ -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: stable/8/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- stable/8/sys/boot/i386/gptboot/gptboot.c Tue Sep 7 18:14:50 2010
(r212300)
+++ stable/8/sys/boot/i386/gptboot/gptboot.c Tue Sep 7 18:14:59 2010
(r212301)
@@ -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: stable/8/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/8/sys/boot/i386/loader/Makefile Tue Sep 7 18:14:50 2010
(r212300)
+++ stable/8/sys/boot/i386/loader/Makefile Tue Sep 7 18:14:59 2010
(r212301)
@@ -6,7 +6,7 @@ MK_SSP= no
LOADER?= loader
PROG= ${LOADER}.sym
INTERNALPROG=
-NEWVERSWHAT?= "bootstrap loader" i386
+NEWVERSWHAT?= "bootstrap loader" x86
# architecture-specific loader code
SRCS= main.c conf.c vers.c
Modified: stable/8/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/8/sys/boot/i386/zfsboot/zfsboot.c Tue Sep 7 18:14:50 2010
(r212300)
+++ stable/8/sys/boot/i386/zfsboot/zfsboot.c Tue Sep 7 18:14:59 2010
(r212301)
@@ -731,7 +731,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);
Modified: stable/8/sys/boot/i386/zfsloader/Makefile
==============================================================================
--- stable/8/sys/boot/i386/zfsloader/Makefile Tue Sep 7 18:14:50 2010
(r212300)
+++ stable/8/sys/boot/i386/zfsloader/Makefile Tue Sep 7 18:14:59 2010
(r212301)
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../loader
LOADER= zfsloader
-NEWVERSWHAT= "ZFS enabled bootstrap loader" i386
+NEWVERSWHAT= "ZFS enabled bootstrap loader" x86
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY= yes
NO_MAN= yes
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
