AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-02-20 08:26:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

static-nodes: don't fail if modules.devname not found

Browse Source 
In containers/VM's/initrd one might not have installed any modules and
accompanying modules.devname Don't fail if this is the case, just warn.

When used in systemd this means we don't get a failing unit on booting
containers.
This commit is contained in:
Tom Gundersen 2013-07-14 15:13:33 +02:00 committed by Lucas De Marchi
parent 85d02ebea3
commit ae17710117
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/static-nodes.c
View File

@ -155,7 +155,8 @@ static int do_static_nodes(int argc, char *argv[])
{
struct utsname kernel;
char modules[PATH_MAX];
FILE *in = NULL, *out = stdout;
const char *output = "/dev/stdout";
FILE *in = NULL, *out = NULL;
const struct static_nodes_format *format = &static_nodes_format_human;
char buf[4096];
int ret = EXIT_SUCCESS;
@ -170,13 +171,7 @@ static int do_static_nodes(int argc, char *argv[])
}
switch (c) {
case 'o':
out = fopen(optarg, "we");
if (out == NULL) {
fprintf(stderr, "Error: could not create %s!\n",
optarg);
ret = EXIT_FAILURE;
goto finish;
}
output = optarg;
break;
case 'f':
valid = 0;
@ -217,12 +212,24 @@ static int do_static_nodes(int argc, char *argv[])
goto finish;
}
snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname",
kernel.release);
snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release);
in = fopen(modules, "re");
if (in == NULL) {
fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",
kernel.release);
if (errno == ENOENT) {
fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n",
kernel.release);
ret = EXIT_SUCCESS;
} else {
fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",
kernel.release);
ret = EXIT_FAILURE;
}
goto finish;
}
out = fopen(output, "we");
if (out == NULL) {
fprintf(stderr, "Error: could not create %s - %m\n", output);
ret = EXIT_FAILURE;
goto finish;
}