From a773090651a1d7b61974fbd637826668e7061449 Mon Sep 17 00:00:00 2001 From: andersen Date: Thu, 1 Feb 2001 22:43:49 +0000 Subject: 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 git-svn-id: svn://busybox.net/trunk/busybox@1739 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- mtab.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'mtab.c') diff --git a/mtab.c b/mtab.c index ab805e9c1..33b11c83e 100644 --- a/mtab.c +++ b/mtab.c @@ -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"; -- cgit v1.2.3-55-g6feb