diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-05-30 23:13:14 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-05-30 23:13:14 +0000 |
| commit | d3f59de567ab6928711666e9299e62b9906d8882 (patch) | |
| tree | b15447d6f26d35fdb62570c8291549570aaafd22 | |
| parent | Added error handler for missing AML nameref; fixes PR6103 (diff) | |
| download | wireguard-openbsd-d3f59de567ab6928711666e9299e62b9906d8882.tar.xz wireguard-openbsd-d3f59de567ab6928711666e9299e62b9906d8882.zip | |
Without -v, be quiet
ok toby
| -rw-r--r-- | sys/arch/amd64/stand/installboot/installboot.c | 20 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 20 |
2 files changed, 22 insertions, 18 deletions
diff --git a/sys/arch/amd64/stand/installboot/installboot.c b/sys/arch/amd64/stand/installboot/installboot.c index ef7220c801f..4be19ff44f2 100644 --- a/sys/arch/amd64/stand/installboot/installboot.c +++ b/sys/arch/amd64/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.11 2009/04/23 16:39:16 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.12 2009/05/30 23:13:14 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -241,17 +241,19 @@ findopenbsd(int devfd, struct disklabel *dl, off_t mbroff, int *n) if (!dp->dp_size) continue; if (dp->dp_typ == DOSPTYP_OPENBSD) { - fprintf(stderr, - "using MBR partition %ld: type 0x%02X offset %d\n", - (long)(dp - mbr.dmbr_parts), - dp->dp_typ, dp->dp_start); + if (verbose) + fprintf(stderr, + "using MBR partition %ld: type 0x%02X offset %d\n", + (long)(dp - mbr.dmbr_parts), + dp->dp_typ, dp->dp_start); return (dp->dp_start + mbroff); } else if (dp->dp_typ == DOSPTYP_EXTEND || dp->dp_typ == DOSPTYP_EXTENDL) { - fprintf(stderr, - "extended partition %ld: type 0x%02X offset %d\n", - (long)(dp - mbr.dmbr_parts), - dp->dp_typ, dp->dp_start); + if (verbose) + fprintf(stderr, + "extended partition %ld: type 0x%02X offset %d\n", + (long)(dp - mbr.dmbr_parts), + dp->dp_typ, dp->dp_start); startoff = (off_t)dp->dp_start + mbroff; start = findopenbsd(devfd, dl, startoff, n); if (start != -1) diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 9fa069e977b..db9c77f6e38 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.54 2009/04/23 16:39:18 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.55 2009/05/30 23:13:18 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -237,17 +237,19 @@ findopenbsd(int devfd, struct disklabel *dl, off_t mbroff, int *n) if (!dp->dp_size) continue; if (dp->dp_typ == DOSPTYP_OPENBSD) { - fprintf(stderr, - "using MBR partition %ld: type 0x%02X offset %d\n", - (long)(dp - mbr.dmbr_parts), - dp->dp_typ, dp->dp_start); + if (verbose) + fprintf(stderr, + "using MBR partition %ld: type 0x%02X offset %d\n", + (long)(dp - mbr.dmbr_parts), + dp->dp_typ, dp->dp_start); return (dp->dp_start + mbroff); } else if (dp->dp_typ == DOSPTYP_EXTEND || dp->dp_typ == DOSPTYP_EXTENDL) { - fprintf(stderr, - "extended partition %ld: type 0x%02X offset %d\n", - (long)(dp - mbr.dmbr_parts), - dp->dp_typ, dp->dp_start); + if (verbose) + fprintf(stderr, + "extended partition %ld: type 0x%02X offset %d\n", + (long)(dp - mbr.dmbr_parts), + dp->dp_typ, dp->dp_start); startoff = (off_t)dp->dp_start + mbroff; start = findopenbsd(devfd, dl, startoff, n); if (start != -1) |