diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-04-05 12:10:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 12:10:11 +0200 |
commit | 6cb484cc062b79db925f04cb8bb7a5cfac622d51 (patch) | |
tree | b6ae996ce5c5c3cb03f59d6af0095777dfe37250 /src/shared/dissect-image.c | |
parent | 5e8273acac6af57d8c9cdec57388bab451a4cbc0 (diff) | |
parent | cc566cd06caf01b9caf609cf872800a5bbd64993 (diff) |
Merge pull request #5706 from keszybz/make-cleanups
Move busctl to its own dir and other cleanups
Diffstat (limited to 'src/shared/dissect-image.c')
-rw-r--r-- | src/shared/dissect-image.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 1c9d21566f..36c94ac71b 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -42,8 +42,8 @@ #include "udev-util.h" #include "xattr-util.h" -static int probe_filesystem(const char *node, char **ret_fstype) { #ifdef HAVE_BLKID +static int probe_filesystem(const char *node, char **ret_fstype) { _cleanup_blkid_free_probe_ blkid_probe b = NULL; const char *fstype; int r; @@ -80,10 +80,8 @@ static int probe_filesystem(const char *node, char **ret_fstype) { not_found: *ret_fstype = NULL; return 0; -#else - return -EOPNOTSUPP; -#endif } +#endif int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectImageFlags flags, DissectedImage **ret) { |