svn commit: r253393 - head/sbin/nvmecontrol

[Jim Harris]

Author: jimharris
Date: Tue Jul 16 15:45:37 2013
New Revision: 253393
URL: http://svnweb.freebsd.org/changeset/base/253393

Log:
  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 at emc.com>
  MFC after:	3 days

Modified:
  head/sbin/nvmecontrol/firmware.c

Modified: head/sbin/nvmecontrol/firmware.c
==============================================================================
--- head/sbin/nvmecontrol/firmware.c	Tue Jul 16 14:42:16 2013	(r253392)
+++ head/sbin/nvmecontrol/firmware.c	Tue Jul 16 15:45:37 2013	(r253393)
@@ -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 "