summaryrefslogtreecommitdiff
path: root/debian/patches/mount-ignore-mounted-all.patch
blob: b3890d4ad377a0448cf3ed611657831b10c7921e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
Linux' mount utility ignores mounted filesystems if mount --all is
invoked. This patch makes our mount do the same.

utils/mount.c (main): Ignore mounted filesystems if --all is given.
---
 utils/mount.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/utils/mount.c b/utils/mount.c
index 73a7539..77b2138 100644
--- a/utils/mount.c
+++ b/utils/mount.c
@@ -631,6 +631,15 @@ main (int argc, char **argv)
 
               if (! match_options (&fs->mntent))
                 continue;
+
+              fsys_t mounted;
+              err = fs_fsys (fs, &mounted);
+              if (err)
+                  error (0, err, "cannot determine if %s is already mounted",
+                         fs->mntent.mnt_fsname);
+
+              if (mounted != MACH_PORT_NULL)
+                continue;
             }
 	    err |= do_mount (fs, remount);
 	  }
-- 
1.7.10.4