aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Dunham <ibid.ag@gmail.com>2015-08-04 22:15:56 -0700
committerRob Landley <rob@landley.net>2015-08-08 16:59:48 -0500
commitd5258b43a2f6795cb49203d67deefd78588dedd7 (patch)
treea45f9e859d14b93c0ec2ed8eb90a4bb6e42f49d6
parent8f1f8ef2a4546cc6089c12fe09735fb0d345c175 (diff)
downloadtoybox-d5258b43a2f6795cb49203d67deefd78588dedd7.tar.gz
modprobe: use -q to silence
-rw-r--r--toys/pending/modprobe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/toys/pending/modprobe.c b/toys/pending/modprobe.c
index 10bd5780..07c53fc2 100644
--- a/toys/pending/modprobe.c
+++ b/toys/pending/modprobe.c
@@ -275,7 +275,8 @@ static int config_action(struct dirtree *node)
get_mod(tokens[1], 1)->flags |= MOD_BLACKLIST;
else if (!strcmp(tokens[0], "install")) continue;
else if (!strcmp(tokens[0], "remove")) continue;
- else error_msg("Invalid option %s found in file %s", tokens[0], filename);
+ else if (toys.optflags & FLAG_q)
+ error_msg("Invalid option %s found in file %s", tokens[0], filename);
}
fclose(fc);
free(filename);
@@ -425,7 +426,7 @@ static int go_probe(struct module_s *m)
int rc = 0, first = 1;
if (!(m->flags & MOD_FNDDEPMOD)) {
- if (!(toys.optflags & FLAG_s))
+ if (!(toys.optflags & FLAG_q))
error_msg("module %s not found in modules.dep", m->name);
return -ENOENT;
}