Author: nwhitehorn
Date: Fri Oct 31 00:52:31 2008
New Revision: 184490
URL: http://svn.freebsd.org/changeset/base/184490
Log:
Modify our boot block to pick an output device, without which boot1 will fail
on G4 machines. On the assumption that most people using FreeBSD on Apple
hardware are not using serial consoles, set boot1's output to screen. This
should be revisited. While here, reduce verbosity of boot1.
Modified:
head/sys/boot/powerpc/boot1.chrp/boot1.c
head/sys/boot/powerpc/boot1.chrp/bootinfo.txt
Modified: head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/boot1.c Thu Oct 30 23:09:19 2008
(r184489)
+++ head/sys/boot/powerpc/boot1.chrp/boot1.c Fri Oct 31 00:52:31 2008
(r184490)
@@ -561,6 +561,10 @@ printf(const char *fmt, ...)
va_list ap;
int ret;
+ /* Don't annoy the user as we probe for partitions */
+ if (strcmp(fmt,"Not ufs\n") == 0)
+ return 0;
+
va_start(ap, fmt);
ret = vprintf(fmt, ap);
va_end(ap);
Modified: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/bootinfo.txt Thu Oct 30 23:09:19
2008 (r184489)
+++ head/sys/boot/powerpc/boot1.chrp/bootinfo.txt Fri Oct 31 00:52:31
2008 (r184490)
@@ -7,6 +7,7 @@
MacRISC MacRISC3 MacRISC4
</COMPATIBLE>
<BOOT-SCRIPT>
+" screen" output
boot &device;:&partition;,\ppc\boot1.elf
</BOOT-SCRIPT>
</CHRP-BOOT>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
