diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-14 10:02:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 10:02:20 +0100 |
| commit | a0790773403792bb75082574715d1e999e2d3aad (patch) | |
| tree | d604dcde8d40abff242c9d816f5918b53a3b7042 /src/shared | |
| parent | 53a20455215e645cf66f1080cc528a994720e8b4 (diff) | |
| parent | 1f6597a84cd3891a69a630c6c4b168da46b1c160 (diff) | |
| download | systemd-a0790773403792bb75082574715d1e999e2d3aad.tar.gz | |
Merge pull request #14013 from keszybz/cryptsetup-keyfile-with-colons
Support cryptsetup keyfiles with colons agains
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/fstab-util.c | 4 | ||||
| -rw-r--r-- | src/shared/fstab-util.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c index 75e4784c38..f90501eb92 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -19,7 +19,7 @@ int fstab_has_fstype(const char *fstype) { _cleanup_endmntent_ FILE *f = NULL; struct mntent *m; - f = setmntent("/etc/fstab", "re"); + f = setmntent(fstab_path(), "re"); if (!f) return errno == ENOENT ? false : -errno; @@ -39,7 +39,7 @@ int fstab_is_mount_point(const char *mount) { _cleanup_endmntent_ FILE *f = NULL; struct mntent *m; - f = setmntent("/etc/fstab", "re"); + f = setmntent(fstab_path(), "re"); if (!f) return errno == ENOENT ? false : -errno; diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h index 0862256511..f575ed0bb2 100644 --- a/src/shared/fstab-util.h +++ b/src/shared/fstab-util.h @@ -31,3 +31,7 @@ static inline bool fstab_test_yes_no_option(const char *opts, const char *yes_no } char *fstab_node_to_udev_node(const char *p); + +static inline const char* fstab_path(void) { + return secure_getenv("SYSTEMD_FSTAB") ?: "/etc/fstab"; +} |