diff options
author | Eric Andersen | 2001-02-01 22:43:49 +0000 |
---|---|---|
committer | Eric Andersen | 2001-02-01 22:43:49 +0000 |
commit | af4ac77d9d13f879922ccad8a8535c24aeea0380 (patch) | |
tree | 47dca5ab2df8982ea929c902216bca6bf9c31f44 /mtab.c | |
parent | b5c29850e31ca41ee643cfe62eb8bc5f8682deb1 (diff) | |
download | busybox-af4ac77d9d13f879922ccad8a8535c24aeea0380.zip busybox-af4ac77d9d13f879922ccad8a8535c24aeea0380.tar.gz |
Apply a patch from Larry Doolittle to add "-all" and "-none" switches
to multibuild.pl. I did a little formatting adjustments to make it
_very_ obvious when things stop working. I also removed the USE_PROCFS
config option -- just do the right thing when USE_DEVPS_PATCH is enabled.
-Erik
Diffstat (limited to 'mtab.c')
-rw-r--r-- | mtab.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -21,12 +21,8 @@ void erase_mtab(const char *name) /* Check if reading the mtab file failed */ if (mountTable == 0 -#if ! defined BB_FEATURE_USE_PROCFS - ) { -#else - /* Bummer. fall back on trying the /proc filesystem */ - && (mountTable = setmntent("/proc/mounts", "r")) == 0) { -#endif + /* Bummer. fall back on trying the /proc filesystem */ + && (mountTable = setmntent("/proc/mounts", "r")) == 0) { perror_msg("%s", mtab_file); return; } @@ -74,14 +70,12 @@ void write_mtab(char *blockDevice, char *directory, if (length > 1 && directory[length - 1] == '/') directory[length - 1] = '\0'; -#ifdef BB_FEATURE_USE_PROCFS if (filesystemType == 0) { struct mntent *p = find_mount_point(blockDevice, "/proc/mounts"); if (p && p->mnt_type) filesystemType = p->mnt_type; } -#endif m.mnt_fsname = blockDevice; m.mnt_dir = directory; m.mnt_type = filesystemType ? filesystemType : "default"; |