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
This commit is contained in:
Jim Harris 2013-07-16 15:45:37 +00:00
parent 9a7bf07ccd
commit 181c4ec270
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=253393

View File

@ -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 "