diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2011-11-13 14:52:31 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2011-11-13 14:52:31 +0000 |
| commit | 7b06c08306e12566af73d8871cd5c6af770cc8b4 (patch) | |
| tree | 70147975688a627059f0a5d923007582da9d2fc5 /sys/arch | |
| parent | bd9f235aefb2e6a4fd862a0fad42ab7920c0be45 (diff) | |
If a softraid chunk is offline we are not necessarily going to have the
disk/partition name - in this case print the chunk number instead.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/installboot/installboot.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/installboot/installboot.c b/sys/arch/amd64/stand/installboot/installboot.c index 9f38b5386e2..982b7011b8b 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.23 2011/07/19 01:08:34 krw Exp $ */ +/* $OpenBSD: installboot.c,v 1.24 2011/11/13 14:52:30 jsing Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -790,13 +790,13 @@ sr_installpbr(int devfd, int vol, int disk) /* Check disk status. */ if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) { - fprintf(stderr, "softraid disk %s not online - skipping...\n", - bd.bd_vendor); + fprintf(stderr, "softraid chunk %u not online - skipping...\n", + disk); return; } if (strlen(bd.bd_vendor) < 1) - errx(1, "invalid disk name %s", bd.bd_vendor); + errx(1, "invalid disk name"); part = bd.bd_vendor[strlen(bd.bd_vendor) - 1]; if (part < 'a' || part >= 'a' + MAXPARTITIONS) errx(1, "invalid partition %c\n", part); diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 781da08251a..cd55ee78dff 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.66 2011/07/19 01:08:35 krw Exp $ */ +/* $OpenBSD: installboot.c,v 1.67 2011/11/13 14:52:30 jsing Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -786,13 +786,13 @@ sr_installpbr(int devfd, int vol, int disk) /* Check disk status. */ if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) { - fprintf(stderr, "softraid disk %s not online - skipping...\n", - bd.bd_vendor); + fprintf(stderr, "softraid chunk %u not online - skipping...\n", + disk); return; } if (strlen(bd.bd_vendor) < 1) - errx(1, "invalid disk name %s", bd.bd_vendor); + errx(1, "invalid disk name"); part = bd.bd_vendor[strlen(bd.bd_vendor) - 1]; if (part < 'a' || part >= 'a' + MAXPARTITIONS) errx(1, "invalid partition %c\n", part); |