From 571d0134bd464444567cf4eb0d2ed8df40045f36 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Jun 2014 19:37:22 +0200 Subject: fsck: consider a fsck implementation linked to /bin/true non-existant --- src/shared/path-util.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/shared/path-util.c') diff --git a/src/shared/path-util.c b/src/shared/path-util.c index fd35e0c786..e68d3677a7 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -541,7 +541,7 @@ int path_is_os_tree(const char *path) { int find_binary(const char *name, char **filename) { assert(name); - if (strchr(name, '/')) { + if (is_path(name)) { if (access(name, X_OK) < 0) return -errno; @@ -626,8 +626,25 @@ bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd } int fsck_exists(const char *fstype) { + _cleanup_free_ char *p = NULL, *d = NULL; const char *checker; + int r; checker = strappenda("fsck.", fstype); - return find_binary(checker, NULL); + + r = find_binary(checker, &p); + if (r < 0) + return r; + + /* An fsck that is linked to /bin/true is a non-existant + * fsck */ + + r = readlink_malloc(p, &d); + if (r >= 0 && + (path_equal(d, "/bin/true") || + path_equal(d, "/usr/bin/true") || + path_equal(d, "/dev/null"))) + return -ENOENT; + + return 0; } -- cgit v1.2.3-54-g00ecf