This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit e9b0c4c50752851525b1baad9fb37d4468f16a3f Author: Samuel Thibault <[email protected]> Date: Sat Feb 8 21:23:32 2014 +0100 patches/mount.patch: Also ignore exec option. --- debian/changelog | 6 ++++++ debian/patches/{mount-loop.patch => mount.patch} | 9 +++++---- debian/patches/series | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 62d375b..a8465f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hurd (1:0.5.git20140206-2) UNRELEASED; urgency=medium + + * patches/mount.patch: Also ignore exec option. + + -- Samuel Thibault <[email protected]> Sat, 08 Feb 2014 21:23:02 +0100 + hurd (1:0.5.git20140206-1) unstable; urgency=medium * control: Only Replace/Conflict old login package which was potentially diff --git a/debian/patches/mount-loop.patch b/debian/patches/mount.patch similarity index 66% rename from debian/patches/mount-loop.patch rename to debian/patches/mount.patch index 07f572b..9d9cd2f 100644 --- a/debian/patches/mount-loop.patch +++ b/debian/patches/mount.patch @@ -1,6 +1,6 @@ -mount: Ignore `loop' option +mount: Ignore `loop' and `exec' options -* utils/mount.c (do_mount): Ignore `loop' option. +* utils/mount.c (do_mount): Ignore `loop' and `exec' options. --- mount.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -8,13 +8,14 @@ diff --git a/utils/mount.c b/utils/mount.c index 8b059c2..8af055e 100644 --- a/utils/mount.c +++ b/utils/mount.c -@@ -248,7 +248,8 @@ do_mount (struct fs *fs, int remount) +@@ -248,7 +248,9 @@ do_mount (struct fs *fs, int remount) { ARGZ (add (&fsopts, &fsopts_len, o)); } - else if (strcmp (o, "defaults") != 0) + else if (strcmp (o, "defaults") != 0 && -+ strcmp (o, "loop") != 0) ++ strcmp (o, "loop") != 0 && ++ strcmp (o, "exec") != 0) { /* Prepend `--' to the option to make a long option switch, e.g. `--ro' or `--rsize=1024'. */ diff --git a/debian/patches/series b/debian/patches/series index 5ae5aa8..a6d6c9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,7 +39,7 @@ exec_filename_exec.patch exec_filename_fs.patch exec_filename_use.patch exec_filename_fix.patch -mount-loop.patch +mount.patch proc_set_init_task.patch newRPC.patch libports_revert_stacksize.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
