summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2018-02-05 15:39:12 +0100
committerJan Kara <jack@suse.cz>2018-02-05 15:54:06 +0100
commit4179911dc38af1b6499704a7f7fb710a40c95bdb (patch)
tree99f3ad2f69d09d0aa4e0249822b175622ffa25ac
parent1806ee01060d363beac01fda28c613ab27dbc4df (diff)
quotacheck: Avoid question in non-interactive mode
A question when quota file version is incorrect is asked even if quotacheck is run in non-interactive mode. Avoid asking the question in that case and fail the check instead. Reproted-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--quotacheck_v2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/quotacheck_v2.c b/quotacheck_v2.c
index 4cc8558..86fbf42 100644
--- a/quotacheck_v2.c
+++ b/quotacheck_v2.c
@@ -363,7 +363,8 @@ static int check_header(char *filename, int fd, int type, int version)
"specified on command line (%d). Quota file header "
"may be corrupted.\n"),
le32toh(head.dqh_version), version);
- if (!ask_yn(_("Continue checking assuming version from command line?"), 1))
+ if (!(flags & FL_INTERACTIVE) ||
+ !ask_yn(_("Continue checking assuming version from command line?"), 1))
return -1;
detected_versions[type] = version;
} else