diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-02-09 19:00:16 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-02-09 19:00:16 +0100 |
| commit | cfb95cedb57c0ef9adc9c93d39cb5d07cb7506a1 (patch) | |
| tree | d6d76d4bab678854776aa864331b1c455c9b8d15 /debian/patches | |
| parent | 7c494201c2bbc4aa5e218246ea094f0d5bc41da5 (diff) | |
sync with upstream packaging
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/mount.patch (renamed from debian/patches/mount-loop.patch) | 11 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/patches/mount-loop.patch b/debian/patches/mount.patch index cbce88b0..9d9cd2f4 100644 --- a/debian/patches/mount-loop.patch +++ b/debian/patches/mount.patch @@ -1,18 +1,21 @@ -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(-) +diff --git a/utils/mount.c b/utils/mount.c +index 8b059c2..8af055e 100644 --- a/utils/mount.c +++ b/utils/mount.c -@@ -273,7 +273,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 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 |