aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-03-20 18:07:13 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-03-20 18:07:13 +0000
commit19b5b8ff6a40bd72685bf63963394dc2b2707e68 (patch)
treeeb23ac62bc3a6473da68c8b9c72db9aa7fdd7d8f /util-linux
parenta6db0eef59ece2b9da6807fa9bdab59a87db8da3 (diff)
downloadbusybox-19b5b8ff6a40bd72685bf63963394dc2b2707e68.tar.gz
busybox-19b5b8ff6a40bd72685bf63963394dc2b2707e68.tar.bz2
Fix some obvious compile problems. Make the -f' fakeIt option actually work.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mount.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 5ddf54cb1..4750989ce 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -179,7 +179,6 @@ static llist_t *get_block_backed_filesystems(void)
llist_t *fslist = 0;
-void delete_block_backed_filesystems(void);
#if ENABLE_FEATURE_CLEAN_UP
static void delete_block_backed_filesystems(void)
{
@@ -189,8 +188,10 @@ static void delete_block_backed_filesystems(void)
#if ENABLE_FEATURE_MTAB_SUPPORT
static int useMtab;
+static int fakeIt;
#else
#define useMtab 0
+#define fakeIt 0
#endif
// Perform actual mount of specific filesystem at specific location.
@@ -202,6 +203,8 @@ static int mount_it_now(struct mntent *mp, int vfsflags)
parse_mount_options(mp->mnt_opts, &filteropts);
+ if (fakeIt) { return 0; }
+
// Mount, with fallback to read-only if necessary.
for(;;) {
@@ -333,8 +336,10 @@ static int singlemount(struct mntent *mp)
if (!fslist) {
fslist = get_block_backed_filesystems();
+#if ENABLE_FEATURE_CLEAN_UP
if (ENABLE_FEATURE_CLEAN_UP && fslist)
atexit(delete_block_backed_filesystems);
+#endif
}
for (fl = fslist; fl; fl = fl->link) {