diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2008-10-31 00:52:31 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2008-10-31 00:52:31 +0000 |
| commit | 197f3f98a5edab8de78c93285d33fe4961b41eb6 (patch) | |
| tree | ab1fd3a9bcbff89fddfd5106c785b6001edc6522 /sys/boot/powerpc | |
| parent | 81bbfda7548109c81dc0ad19b822cf8b3df1af42 (diff) | |
| download | FreeBSD-src-197f3f98a5edab8de78c93285d33fe4961b41eb6.zip FreeBSD-src-197f3f98a5edab8de78c93285d33fe4961b41eb6.tar.gz | |
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.
Diffstat (limited to 'sys/boot/powerpc')
| -rw-r--r-- | sys/boot/powerpc/boot1.chrp/boot1.c | 4 | ||||
| -rw-r--r-- | sys/boot/powerpc/boot1.chrp/bootinfo.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/boot/powerpc/boot1.chrp/boot1.c b/sys/boot/powerpc/boot1.chrp/boot1.c index 651db76..6a6ad07 100644 --- a/sys/boot/powerpc/boot1.chrp/boot1.c +++ b/sys/boot/powerpc/boot1.chrp/boot1.c @@ -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); diff --git a/sys/boot/powerpc/boot1.chrp/bootinfo.txt b/sys/boot/powerpc/boot1.chrp/bootinfo.txt index bd4b113..61cf007 100644 --- a/sys/boot/powerpc/boot1.chrp/bootinfo.txt +++ b/sys/boot/powerpc/boot1.chrp/bootinfo.txt @@ -7,6 +7,7 @@ MacRISC MacRISC3 MacRISC4 </COMPATIBLE> <BOOT-SCRIPT> +" screen" output boot &device;:&partition;,\ppc\boot1.elf </BOOT-SCRIPT> </CHRP-BOOT> |
