Author: jimharris
Date: Tue Jul 9 21:20:08 2013
New Revision: 253110
URL: http://svnweb.freebsd.org/changeset/base/253110
Log:
Try to read firmware image before prompting the user to confirm
firmware download. This correctly prints an error and exits for
an incorrect firmware image name before prompting the user to
confirm the download.
Sponsored by: Intel
MFC after: 3 days
Modified:
head/sbin/nvmecontrol/firmware.c
Modified: head/sbin/nvmecontrol/firmware.c
==============================================================================
--- head/sbin/nvmecontrol/firmware.c Tue Jul 9 21:14:15 2013
(r253109)
+++ head/sbin/nvmecontrol/firmware.c Tue Jul 9 21:20:08 2013
(r253110)
@@ -253,6 +253,9 @@ firmware(int argc, char *argv[])
"of available images\n",
slot, controller);
+ if (f_flag)
+ read_image_file(image, &buf, &size);
+
if (f_flag && a_flag)
printf("You are about to download and activate "
"firmware image (%s) to controller %s.\n"
@@ -282,7 +285,6 @@ firmware(int argc, char *argv[])
}
if (f_flag) {
- read_image_file(image, &buf, &size);
update_firmware(fd, buf, size);
if (a_flag)
activate_firmware(fd, slot,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
