canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvmutil: do setmac if only filename given 

./nvm gbe.bin

with this patch, the above example does the same as:

./nvm gbe.bin setmac

now you can simply specify the gbe file, and it will
randomise the mac address within it, and update the
nvm checksum word.

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2025-01-27 18:40:44 +00:00
parent a0d7c564fb
commit 698b9ff63b
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
util/nvmutil/nvmutil.c
View File

@ -78,10 +78,12 @@ main(int argc, char *argv[])
err_if(pledge("stdio rpath wpath unveil", NULL) == -1); err_if(pledge("stdio rpath wpath unveil", NULL) == -1);
#endif #endif
if (argc < 3) { /* TODO: manpage! */ if (argc < 2) { /* TODO: manpage! */
fprintf(stderr, "Modify Intel GbE NVM images e.g. set MAC\n"); fprintf(stderr, "Modify Intel GbE NVM images e.g. set MAC\n");
fprintf(stderr, "USAGE:\n"); fprintf(stderr, "USAGE:\n");
fprintf(stderr, " %s FILE dump\n", argv[0]); fprintf(stderr, " %s FILE dump\n", argv[0]);
fprintf(stderr, " %s FILE\n # does same as setmac without arg",
argv[0]);
fprintf(stderr, " %s FILE setmac [MAC]\n", argv[0]); fprintf(stderr, " %s FILE setmac [MAC]\n", argv[0]);
fprintf(stderr, " %s FILE swap\n", argv[0]); fprintf(stderr, " %s FILE swap\n", argv[0]);
fprintf(stderr, " %s FILE copy 0|1\n", argv[0]); fprintf(stderr, " %s FILE copy 0|1\n", argv[0]);
@ -92,14 +94,16 @@ main(int argc, char *argv[])
filename = argv[1]; filename = argv[1];
if (strcmp(COMMAND, "dump") == 0) { flags = O_RDWR;
flags = O_RDONLY; /* write not needed for dump cmd */
if (argc > 2) {
if (strcmp(COMMAND, "dump") == 0) {
flags = O_RDONLY; /* write not needed for dump cmd */
#ifdef __OpenBSD__ #ifdef __OpenBSD__
/* writes not needed for the dump command */ /* writes not needed for the dump command */
err_if(pledge("stdio rpath unveil", NULL) == -1); err_if(pledge("stdio rpath unveil", NULL) == -1);
#endif #endif
} else { }
flags = O_RDWR;
} }
/* check for dir first, to prevent unveil from /* check for dir first, to prevent unveil from
@ -129,14 +133,19 @@ main(int argc, char *argv[])
err_if(pledge("stdio", NULL) == -1); err_if(pledge("stdio", NULL) == -1);
#endif #endif
for (int i = 0; (i < 6) && (cmd == NULL); i++) { if (argc > 2) {
if (strcmp(COMMAND, op[i].str) != 0) for (int i = 0; (i < 6) && (cmd == NULL); i++) {
continue; if (strcmp(COMMAND, op[i].str) != 0)
if (argc >= op[i].args) { continue;
cmd = op[i].cmd; if (argc >= op[i].args) {
break; cmd = op[i].cmd;
break;
}
err(errno = EINVAL, "Too few args on command '%s'",
op[i].str);
} }
err(errno = EINVAL, "Too few args on command '%s'", op[i].str); } else {
cmd = cmd_setmac;
} }
if (cmd == cmd_setmac) { if (cmd == cmd_setmac) {