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

2 files changed, 2 insertions, 6 deletions

diff --git a/util-linux/more.c b/util-linux/more.c
index c4c74fe4a..15c3b6f87 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -1,3 +1,4 @@
+#error Foo
 /* vi: set sw=4 ts=4: */
 /*
  * Mini more implementation for busybox
diff --git a/util-linux/mount.c b/util-linux/mount.c
index b571e5035..79813ba18 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -232,13 +232,9 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
 {
         int status = 0;
 
-#if defined BB_FEATURE_USE_PROCFS
         char buf[255];
         if (strcmp(filesystemType, "auto") == 0) {
-                FILE *f = fopen("/proc/filesystems", "r");
-
-                if (f == NULL)
-                        return (FALSE);
+                FILE *f = xfopen("/proc/filesystems", "r");
 
                 while (fgets(buf, sizeof(buf), f) != NULL) {
                         filesystemType = buf;
@@ -261,7 +257,6 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
                 }
                 fclose(f);
         } else
-#endif
 #if defined BB_FEATURE_USE_DEVPS_PATCH
         if (strcmp(filesystemType, "auto") == 0) {
                 int fd, i, numfilesystems;