Mercurial > illumos > illumos-gate
changeset 10869:a0eba84ac81d
6894521 fwflash need to be synced between nv gate and unbundle gate
| author | XinChen <Xin.Chen@Sun.COM> |
|---|---|
| date | Mon, 26 Oct 2009 13:27:22 +0800 |
| parents | 1ade84fed5a2 |
| children | 312ce57c0d19 |
| files | usr/src/cmd/fwflash/common/fwflash.c usr/src/cmd/fwflash/plugins/transport/common/sd.c usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/fwflash/common/fwflash.c Sun Oct 25 21:17:26 2009 -0700 +++ b/usr/src/cmd/fwflash/common/fwflash.c Mon Oct 26 13:27:22 2009 +0800 @@ -50,7 +50,7 @@ #if !defined(lint) /* embedded software license agreement */ -static char *sla [] = { "Copyright 2007 Sun Microsystems, Inc., 4150 Network " +static char *sla [] = { "Copyright 2009 Sun Microsystems, Inc., 4150 Network " "Circle, Santa Clara, California 95054, U.S.A. All rights reserved. U.S. " "Government Rights - Commercial software. Government users are subject to the " "Sun Microsystems, Inc. standard license agreement and applicable provisions " @@ -92,7 +92,7 @@ * actually of any use - it doesn't line up with Mercurial's * concept of the changeset. */ -#define FWFLASH_VERSION "v1.8" +#define FWFLASH_VERSION "v1.9" #define FWFLASH_PROG_NAME "fwflash" static int get_fileopts(char *options);
--- a/usr/src/cmd/fwflash/plugins/transport/common/sd.c Sun Oct 25 21:17:26 2009 -0700 +++ b/usr/src/cmd/fwflash/plugins/transport/common/sd.c Mon Oct 26 13:27:22 2009 +0800 @@ -286,8 +286,7 @@ logmsg(MSG_INFO, "unable to get device path for " "current node with errno %d\n", errno); continue; - }; - + } /* * We check if this is removable device, in which case * we really aren't interested, so exit stage left
--- a/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c Sun Oct 25 21:17:26 2009 -0700 +++ b/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c Mon Oct 26 13:27:22 2009 +0800 @@ -180,7 +180,7 @@ if (resp != 'Y' && resp != 'y') { free(vps); logmsg(MSG_ERROR, gettext("Not proceeding with " - "flash operation of %s on %s"), + "flash operation of %s on %s\n"), verifier->imgfile, devicenode->drvname); return (FWFLASH_FAILURE); }