diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-17 14:29:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-17 14:29:41 +0200 |
| commit | 746af6e0b5aaed999be912e48505d3edc2cf874a (patch) | |
| tree | e683aa6525e4eee3d7621c2c4a85f6042184c8b0 /src/basic/path-util.c | |
| parent | b50a16af8e3c353703d55f117077fcf60b8081e8 (diff) | |
| parent | 24737c291738313fd67924172988a8986f60e958 (diff) | |
Merge pull request #3049 from keszybz/preset-fixes
Fixes for preset-all handling and a few related issues
Diffstat (limited to 'src/basic/path-util.c')
| -rw-r--r-- | src/basic/path-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 822c09bfba..044a12889d 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -569,10 +569,10 @@ static int binary_is_good(const char *binary) { if (r < 0) return r; - return !path_equal(d, "true") && - !path_equal(d, "/bin/true") && - !path_equal(d, "/usr/bin/true") && - !path_equal(d, "/dev/null"); + return !PATH_IN_SET(d, "true" + "/bin/true", + "/usr/bin/true", + "/dev/null"); } int fsck_exists(const char *fstype) { |