Date: Wed, 24 Jul 2013 22:34:06 +0000 (UTC) From: Jim Harris <jimharris@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253624 - stable/9/sbin/nvmecontrol Message-ID: <201307242234.r6OMY7BO048210@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jimharris Date: Wed Jul 24 22:34:06 2013 New Revision: 253624 URL: http://svnweb.freebsd.org/changeset/base/253624 Log: MFC r253393: 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. Approved by: re (kib) Sponsored by: Intel Modified: stable/9/sbin/nvmecontrol/firmware.c Directory Properties: stable/9/sbin/nvmecontrol/ (props changed) Modified: stable/9/sbin/nvmecontrol/firmware.c ============================================================================== --- stable/9/sbin/nvmecontrol/firmware.c Wed Jul 24 22:26:58 2013 (r253623) +++ stable/9/sbin/nvmecontrol/firmware.c Wed Jul 24 22:34:06 2013 (r253624) @@ -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 "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307242234.r6OMY7BO048210>