diff options
| author | Eric Andersen | 2001-04-01 16:01:11 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-04-01 16:01:11 +0000 |
| commit | c4cef5ab063d7abb604d48610424566202dcade0 (patch) | |
| tree | c661196acbb1adfa81257a7f23b08bd15d653be8 /util-linux | |
| parent | f77d88641d934fbd9ed0da8c8e31c84dc5856532 (diff) | |
| download | busybox-c4cef5ab063d7abb604d48610424566202dcade0.zip busybox-c4cef5ab063d7abb604d48610424566202dcade0.tar.gz | |
Move the mtab support stuff into libbb
-Erik
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mount.c | 4 | ||||
| -rw-r--r-- | util-linux/umount.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 9f7ac43..57dc73e 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -160,7 +160,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, /* If the mount was sucessful, do anything needed, then return TRUE */ if (status == 0 || fakeIt==TRUE) { -#if defined BB_MTAB +#if defined BB_FEATURE_MTAB_SUPPORT if (useMtab == TRUE) { erase_mtab(specialfile); // Clean any stale entries write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); @@ -385,7 +385,7 @@ extern int mount_main(int argc, char **argv) case 'f': fakeIt = TRUE; break; -#ifdef BB_MTAB +#ifdef BB_FEATURE_MTAB_SUPPORT case 'n': useMtab = FALSE; break; diff --git a/util-linux/umount.c b/util-linux/umount.c index cc7d38d..3e23b97 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -57,7 +57,7 @@ static int doForce = FALSE; #if defined BB_FEATURE_MOUNT_LOOP static int freeLoop = TRUE; #endif -#if defined BB_MTAB +#if defined BB_FEATURE_MTAB_SUPPORT static int useMtab = TRUE; #endif static int umountAll = FALSE; @@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which) if (which == MTAB_GETMOUNTPT) { return cur->mountpt; } else { -#if !defined BB_MTAB +#if !defined BB_FEATURE_MTAB_SUPPORT if (strcmp(cur->device, "/dev/root") == 0) { /* Adjusts device to be the real root device, * or leaves device alone if it can't find it */ @@ -197,7 +197,7 @@ static int do_umount(const char *name) } } if (status == 0) { -#if defined BB_MTAB +#if defined BB_FEATURE_MTAB_SUPPORT if (useMtab == TRUE) erase_mtab(name); #endif @@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv) freeLoop = FALSE; break; #endif -#ifdef BB_MTAB +#ifdef BB_FEATURE_MTAB_SUPPORT case 'n': useMtab = FALSE; break; |