Replace Revert-pid1-reconnect-to-the-console-before-being-re-exec.patch with upstream patch

The reversion was done upstream, move in series and cherry-pick patch from
upstream master.

Gbp-Dch: Ignore

debian/patches/Revert-pid1-reconnect-to-the-console-before-being-re-exec.patch

@@ -1,20 +1,25 @@
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 16 Aug 2016 20:47:11 +0200
+From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 18 Aug 2016 21:39:39 -0400
 Subject: Revert "pid1: reconnect to the console before being re-executed"
 
 This reverts commit affd7ed1a923b0df8479cff1bd9eafb625fdaa66.
 
-Bug: https://github.com/systemd/systemd/issues/3842
-Bug-Debian: https://bugs.debian.org/834367
+> So it looks like make_console_stdio() has bad side effect. More specifically it
+> does a TIOCSCTTY ioctl (via acquire_terminal()) which sees to disturb the
+> process which was using/owning the console.
+
+Fixes #3842.
+https://bugs.debian.org/834367
+https://bugzilla.redhat.com/show_bug.cgi?id=1367766
 ---
  src/core/main.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/core/main.c b/src/core/main.c
-index a19b61d..2277e38 100644
+index f2adca7..f59a55f 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -2005,9 +2005,6 @@ finish:
+@@ -2016,9 +2016,6 @@ finish:
                                  log_error_errno(r, "Failed to switch root, trying to continue: %m");
                  }
  
@@ -24,7 +29,7 @@ index a19b61d..2277e38 100644
                  args_size = MAX(6, argc+1);
                  args = newa(const char*, args_size);
  
-@@ -2055,6 +2052,9 @@ finish:
+@@ -2066,6 +2063,9 @@ finish:
                  arg_serialization = safe_fclose(arg_serialization);
                  fds = fdset_free(fds);
  

debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch

@@ -19,7 +19,7 @@ Bug-Debian: https://bugs.debian.org/815020
  2 files changed, 1 insertion(+), 12 deletions(-)
 
 diff --git a/src/core/main.c b/src/core/main.c
-index f2adca7..a19b61d 100644
+index f59a55f..2277e38 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
 @@ -1503,17 +1503,6 @@ int main(int argc, char *argv[]) {

debian/patches/series

@@ -1,5 +1,6 @@
 units-add-graphical-session.target-user-unit-3678.patch
 units-add-graphical-session-pre.target-user-unit-3848.patch
+Revert-pid1-reconnect-to-the-console-before-being-re-exec.patch
 debian/Use-Debian-specific-config-files.patch
 debian/don-t-try-to-start-autovt-units-when-not-running-wit.patch
 debian/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch
@@ -24,4 +25,3 @@ debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch
 debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
 debian/Revert-core-enable-TasksMax-for-all-services-by-default-a.patch
 debian/Revert-units-add-a-basic-SystemCallFilter-3471.patch
-debian/Revert-pid1-reconnect-to-the-console-before-being-re-exec.patch