Allow to disable default microcode updates search path with the new
'-n' option. Look for updates in the default locations only after user-supplied locations are tried. If newer microcode files are put into non-standard path, both measures allow to avoid situation where older update loaded from the default path first, and then the second update is applied from non-standard path. Applying intermediate updates might be undesirable. Sponsored by: The FreeBSD Foundation MFC after: 1 week
This commit is contained in:
parent
931329f89b
commit
0539c17353
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=324113
@ -60,6 +60,7 @@ int verbosity_level = 0;
|
||||
#define FLAG_I 0x01
|
||||
#define FLAG_M 0x02
|
||||
#define FLAG_U 0x04
|
||||
#define FLAG_N 0x08
|
||||
|
||||
#define OP_INVAL 0x00
|
||||
#define OP_READ 0x01
|
||||
@ -427,11 +428,7 @@ main(int argc, char *argv[])
|
||||
error = 0;
|
||||
cmdarg = ""; /* To keep gcc3 happy. */
|
||||
|
||||
/*
|
||||
* Add all default data dirs to the list first.
|
||||
*/
|
||||
datadir_add(DEFAULT_DATADIR);
|
||||
while ((c = getopt(argc, argv, "d:hi:m:uv")) != -1) {
|
||||
while ((c = getopt(argc, argv, "d:hi:m:nuv")) != -1) {
|
||||
switch (c) {
|
||||
case 'd':
|
||||
datadir_add(optarg);
|
||||
@ -444,6 +441,9 @@ main(int argc, char *argv[])
|
||||
flags |= FLAG_M;
|
||||
cmdarg = optarg;
|
||||
break;
|
||||
case 'n':
|
||||
flags |= FLAG_N;
|
||||
break;
|
||||
case 'u':
|
||||
flags |= FLAG_U;
|
||||
break;
|
||||
@ -463,6 +463,8 @@ main(int argc, char *argv[])
|
||||
usage();
|
||||
/* NOTREACHED */
|
||||
}
|
||||
if ((flags & FLAG_N) == 0)
|
||||
datadir_add(DEFAULT_DATADIR);
|
||||
dev = argv[0];
|
||||
c = flags & (FLAG_I | FLAG_M | FLAG_U);
|
||||
switch (c) {
|
||||
|
Loading…
Reference in New Issue
Block a user