diff options
| author | Erik Andersen | 2000-05-03 03:19:06 +0000 |
|---|---|---|
| committer | Erik Andersen | 2000-05-03 03:19:06 +0000 |
| commit | 0a704e8ff62a7fdcd08f1fcc89ca66133da2db07 (patch) | |
| tree | 6c6b2f7615f63ddf6f209c23ce02424b58346651 /util-linux | |
| parent | a19bc64653aab46f6335ed6aa7d7d70ff7b5fb0b (diff) | |
| download | busybox-0a704e8ff62a7fdcd08f1fcc89ca66133da2db07.zip busybox-0a704e8ff62a7fdcd08f1fcc89ca66133da2db07.tar.gz | |
Remove BB_FEATURE_REMOUNT (small, and should always be present)
and fix documentation dependancy checks, so it is only built when
it should be built.
-Erik
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/umount.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/util-linux/umount.c b/util-linux/umount.c index 92eb0a6..ad7de2d 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -37,9 +37,7 @@ static const char umount_usage[] = #else "\n" #endif -#ifdef BB_FEATURE_REMOUNT "\t-r:\tTry to remount devices as read-only if mount is busy\n" -#endif #if defined BB_FEATURE_MOUNT_LOOP "\t-f:\tDo not free loop device (if a loop device has been used)\n" #endif @@ -60,9 +58,7 @@ static int freeLoop = TRUE; #endif static int useMtab = TRUE; static int umountAll = FALSE; -#if defined BB_FEATURE_REMOUNT static int doRemount = FALSE; -#endif extern const char mtab_file[]; /* Defined in utility.c */ @@ -180,7 +176,6 @@ static int do_umount(const char *name, int useMtab) /* this was a loop device, delete it */ del_loop(blockDevice); #endif -#if defined BB_FEATURE_REMOUNT if (status != 0 && doRemount == TRUE && errno == EBUSY) { status = mount(blockDevice, name, NULL, MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); @@ -193,7 +188,6 @@ static int do_umount(const char *name, int useMtab) blockDevice); } } -#endif if (status == 0) { #if defined BB_MTAB if (useMtab == TRUE) @@ -255,11 +249,9 @@ extern int umount_main(int argc, char **argv) useMtab = FALSE; break; #endif -#ifdef BB_FEATURE_REMOUNT case 'r': doRemount = TRUE; break; -#endif case 'v': break; /* ignore -v */ default: |