X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fgenerator.c;h=5ac7b5f02f379fae03a7ff5392b77f6d6ee6a8e1;hb=638ca89c53e2b897cfb3f627f4acbc7d09af2f4c;hp=61103031db23b31df7a5d7c79dc98d11608a3d4a;hpb=6db615c17ee7a434f9e0c40d67a1f833d8f3cc9d;p=elogind.git
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 61103031d..5ac7b5f02 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -19,6 +19,7 @@
along with systemd; If not, see .
***/
+#include
#include
#include "util.h"
@@ -26,6 +27,7 @@
#include "mkdir.h"
#include "unit-name.h"
#include "generator.h"
+#include "path-util.h"
int generator_write_fsck_deps(
FILE *f,
@@ -45,16 +47,12 @@ int generator_write_fsck_deps(
}
if (!isempty(fstype) && !streq(fstype, "auto")) {
- const char *checker;
int r;
-
- checker = strappenda("/sbin/fsck.", fstype);
- r = access(checker, X_OK);
+ r = fsck_exists(fstype);
if (r < 0) {
- log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
-
+ log_warning("Checking was requested for %s, but fsck.%s cannot be used: %s", what, fstype, strerror(-r));
/* treat missing check as essentially OK */
- return errno == ENOENT ? 0 : -errno;
+ return r == -ENOENT ? 0 : r;
}
}