mount: ignore NFS bg option on NOMMU machines
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Tue, 4 Sep 2007 18:30:26 +0000 (18:30 +0000)
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Tue, 4 Sep 2007 18:30:26 +0000 (18:30 +0000)
git-svn-id: svn://busybox.net/trunk/busybox@19782 69ca8d6d-28ef-0310-b511-8ec308f3f277

util-linux/mount.c

index e7818ac..3aadbf7 100644 (file)
@@ -725,6 +725,7 @@ next:
        return &p;
 }
 
+#if BB_MMU
 static int daemonize(void)
 {
        int fd;
@@ -744,6 +745,9 @@ static int daemonize(void)
        logmode = LOGMODE_SYSLOG;
        return 1;
 }
+#else
+static inline int daemonize(void) { return -ENOSYS; }
+#endif
 
 // TODO
 static inline int we_saw_this_host_before(const char *hostname)
@@ -786,7 +790,11 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
        int port;
        int mountport;
        int proto;
-       int bg;
+#if BB_MMU
+       int bg = 0;
+#else
+       enum { bg = 0 };
+#endif
        int soft;
        int intr;
        int posix;
@@ -867,7 +875,6 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
        data.acdirmax   = 60;
        data.namlen     = NAME_MAX;
 
-       bg = 0;
        soft = 0;
        intr = 0;
        posix = 0;
@@ -1010,10 +1017,14 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
                        }
                        switch (index_in_strings(options, opt)) {
                        case 0: // "bg"
+#if BB_MMU
                                bg = val;
+#endif
                                break;
                        case 1: // "fg"
+#if BB_MMU
                                bg = !val;
+#endif
                                break;
                        case 2: // "soft"
                                soft = val;