Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

Conflicts:
	debian/changelog

1 files changed, 0 insertions, 32 deletions

diff --git a/debian/patches/mount-ignore-mounted-all.patch b/debian/patches/mount-ignore-mounted-all.patch
deleted file mode 100644
index b3890d4a..00000000
--- a/debian/patches/mount-ignore-mounted-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
-