summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorEric Andersen2000-08-02 18:48:26 +0000
committerEric Andersen2000-08-02 18:48:26 +0000
commitfdd51033480e6d93af274bfd0df25b14aaea6c3b (patch)
tree06e7faef9293569687b853590742c91e1e36d940 /utility.c
parent5ae166813f8a6db9784e75c9b3843e1e30a7465f (diff)
downloadbusybox-fdd51033480e6d93af274bfd0df25b14aaea6c3b.zip
busybox-fdd51033480e6d93af274bfd0df25b14aaea6c3b.tar.gz
Merge in two patches from Dave Cinege:
the first is a cleanup of tar --exclude the second changes mount so mtab works more as it should, and also allows mount to use the traditional short form (i.e. 'mount / -o remount,rw' now works. While inside tar, I changed it to use getopt... -Erik
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/utility.c b/utility.c
index 422d569..bc5a5bd 100644
--- a/utility.c
+++ b/utility.c
@@ -68,11 +68,11 @@
#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-# if defined BB_FEATURE_USE_PROCFS
-const char mtab_file[] = "/proc/mounts";
-# else
-# if defined BB_MTAB
+# if defined BB_MTAB
const char mtab_file[] = "/etc/mtab";
+# else
+# if defined BB_FEATURE_USE_PROCFS
+const char mtab_file[] = "/proc/mounts";
# else
# if defined BB_FEATURE_USE_DEVPS_PATCH
const char mtab_file[] = "/dev/mtab";