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 <andreas@xxxxxxxx>
---
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.1.0.rc1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
