diff options
| author | jimharris <jimharris@FreeBSD.org> | 2013-07-16 15:45:37 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2013-07-16 15:45:37 +0000 |
| commit | 306e14bae389ddad05452ba4aaab074dd0002e44 (patch) | |
| tree | 2baee10c00c946e06fa5d5d6dab7892a93a168fe /sbin/nvmecontrol | |
| parent | a198a61e54adc5c0185bed0927496abd5fb9f158 (diff) | |
| download | FreeBSD-src-306e14bae389ddad05452ba4aaab074dd0002e44.zip FreeBSD-src-306e14bae389ddad05452ba4aaab074dd0002e44.tar.gz | |
Do not throw an error if the user requests to activate the image from
an empty firmware slot, as long as the user has specified a firmware
image to download into the empty firmware slot.
Sponsored by: Intel
Reported by: Joe Golio <joseph.golio@emc.com>
MFC after: 3 days
Diffstat (limited to 'sbin/nvmecontrol')
| -rw-r--r-- | sbin/nvmecontrol/firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index 66c7517..cb7fb0f 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -246,7 +246,7 @@ firmware(int argc, char *argv[]) "slot %d specified but controller only supports %d slots", slot, cdata.frmw.num_slots); - if (!slot_has_valid_firmware(fd, slot)) + if (a_flag && !f_flag && !slot_has_valid_firmware(fd, slot)) errx(1, "slot %d does not contain valid firmware,\n" "try 'nvmecontrol logpage -p 3 %s' to get a list " |
