diff options
| author | XinChen <Xin.Chen@Sun.COM> | 2009-10-26 13:27:22 +0800 |
|---|---|---|
| committer | XinChen <Xin.Chen@Sun.COM> | 2009-10-26 13:27:22 +0800 |
| commit | 0bc9814f152db9078852cc4ec759a4d8b53a1b8b (patch) | |
| tree | 51863805ee81f7ac405c52c2b1354104aacbf0bd /usr/src/cmd | |
| parent | 4a20ca87c19352fb04bb75918ba0231663faa6a8 (diff) | |
| download | illumos-joyent-0bc9814f152db9078852cc4ec759a4d8b53a1b8b.tar.gz | |
6894521 fwflash need to be synced between nv gate and unbundle gate
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/fwflash/common/fwflash.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/fwflash/plugins/transport/common/sd.c | 3 | ||||
| -rw-r--r-- | usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/fwflash/common/fwflash.c b/usr/src/cmd/fwflash/common/fwflash.c index 8bc95e681d..013e041f40 100644 --- a/usr/src/cmd/fwflash/common/fwflash.c +++ b/usr/src/cmd/fwflash/common/fwflash.c @@ -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 @@ static int fwflash_in_write = 0; * 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); diff --git a/usr/src/cmd/fwflash/plugins/transport/common/sd.c b/usr/src/cmd/fwflash/plugins/transport/common/sd.c index 80144ef749..46faad0877 100644 --- a/usr/src/cmd/fwflash/plugins/transport/common/sd.c +++ b/usr/src/cmd/fwflash/plugins/transport/common/sd.c @@ -286,8 +286,7 @@ fw_identify(int start) 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 diff --git a/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c b/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c index fe5cbf9a92..0f29251bca 100644 --- a/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c +++ b/usr/src/cmd/fwflash/plugins/vendor/tavor-MELLANOX.c @@ -180,7 +180,7 @@ vendorvrfy(struct devicelist *devicenode) 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); } |