From 72d56a76669c0ae4ba697baaf5529bd56877fd58 Mon Sep 17 00:00:00 2001 From: andersen Date: Fri, 28 Feb 2003 06:29:27 +0000 Subject: There is no good reason to prevent nfs mounts from being mounted during 'mount -a'. If the user wants to do that, hey, its their lifs. If the nfs server is down and they don't want to wait for nfs to time out, that is their problem. -Erik git-svn-id: svn://busybox.net/trunk/busybox@6648 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- util-linux/mount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util-linux/mount.c b/util-linux/mount.c index 32d0dd5b9..b3e945ce3 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -439,8 +439,8 @@ extern int mount_main(int argc, char **argv) if (all && ( /* If we're mounting 'all' */ (strstr(m->mnt_opts, "noauto")) || /* and the file system isn't noauto, */ - (strstr(m->mnt_type, "swap")) || /* and isn't swap or nfs, then mount it */ - (strstr(m->mnt_type, "nfs")))) { + (strstr(m->mnt_type, "swap")))) /* and isn't swap, then mount it */ + { continue; } -- cgit v1.2.3-55-g6feb