summaryrefslogtreecommitdiff
path: root/debian/patches/mount-ignore-mounted-all.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/mount-ignore-mounted-all.patch')
-rw-r--r--debian/patches/mount-ignore-mounted-all.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/mount-ignore-mounted-all.patch b/debian/patches/mount-ignore-mounted-all.patch
new file mode 100644
index 00000000..b3890d4a
--- /dev/null
+++ b/debian/patches/mount-ignore-mounted-all.patch
@@ -0,0 +1,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
+
+