From 196df39b90c7d8500de1629e911c9635320d0c9e Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Mon, 4 Aug 2014 12:41:29 +0200 Subject: [PATCH 1/3] libmount: only invoke loopcxt on linux This is part of an attempt to make libmount buildable on non-linux. The support for /dev/loop* is Linux-specific so just disable it on non-linux for now. Signed-off-by: Andreas Henriksson --- libmount/src/cache.c | 2 ++ libmount/src/tab.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libmount/src/cache.c b/libmount/src/cache.c index 8b2e656..fcd84fd 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -633,6 +633,7 @@ char *mnt_pretty_path(const char *path, struct libmnt_cache *cache) if (!pretty) return strdup("none"); +#ifdef __linux__ /* users assume backing file name rather than /dev/loopN in * output if the device has been initialized by mount(8). */ @@ -653,6 +654,7 @@ char *mnt_pretty_path(const char *path, struct libmnt_cache *cache) loopcxt_deinit(&lc); } +#endif done: /* don't return pointer to the cache, allocate a new string */ diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 4094fb8..011ba54 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -1439,8 +1439,10 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) } else flags = LOOPDEV_FL_OFFSET; +#if __linux__ if (loopdev_is_used(mnt_fs_get_srcpath(fs), src, offset, flags)) break; +#endif } if (root) { -- 2.0.1