From cfb95cedb57c0ef9adc9c93d39cb5d07cb7506a1 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sun, 9 Feb 2014 19:00:16 +0100
Subject: sync with upstream packaging

---
 debian/patches/mount-loop.patch | 18 ------------------
 debian/patches/mount.patch      | 21 +++++++++++++++++++++
 debian/patches/series           |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 debian/patches/mount-loop.patch
 create mode 100644 debian/patches/mount.patch

(limited to 'debian/patches')

diff --git a/debian/patches/mount-loop.patch b/debian/patches/mount-loop.patch
deleted file mode 100644
index cbce88b0..00000000
--- a/debian/patches/mount-loop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-mount: Ignore `loop' option
-
-* utils/mount.c (do_mount): Ignore `loop' option.
----
- mount.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
---- a/utils/mount.c
-+++ b/utils/mount.c
-@@ -273,7 +273,8 @@ 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)
-       {
- 	/* Prepend `--' to the option to make a long option switch,
- 	   e.g. `--ro' or `--rsize=1024'.  */
diff --git a/debian/patches/mount.patch b/debian/patches/mount.patch
new file mode 100644
index 00000000..9d9cd2f4
--- /dev/null
+++ b/debian/patches/mount.patch
@@ -0,0 +1,21 @@
+mount: Ignore `loop' and `exec' options
+
+* utils/mount.c (do_mount): Ignore `loop' and `exec' options.
+---
+ mount.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+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,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, "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 ec9edb8c..333eca0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,7 +40,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
 revert-remove-threadvars-hack.patch
-- 
cgit v1.2.3