also remove the Delegate option from lxc@.service

diff --git a/debian/patches/remove-systemd-delegate-flag.patch b/debian/patches/remove-systemd-delegate-flag.patch
index ef87da889efa9c03b8dce657da0a428a15910dcd..c8e157facd1e7cc1d2dc47ccdcfb6f21e7fd5bda 100644 (file)
--- a/debian/patches/remove-systemd-delegate-flag.patch
+++ b/debian/patches/remove-systemd-delegate-flag.patch
@@ -13,3 +13,14 @@ Index: new/config/init/systemd/lxc.service.in
  StandardOutput=syslog
  StandardError=syslog
  
+--- new.orig/config/init/systemd/lxc@.service.in
++++ new/config/init/systemd/lxc@.service.in
+@@ -12,7 +12,7 @@ ExecStart=@LIBEXECDIR@/lxc/lxc-container
+ ExecStart=/usr/bin/lxc-start -n %i
+ # Environment=BOOTUP=serial
+ # Environment=CONSOLETYPE=serial
+-Delegate=yes
++#Delegate=yes
+ StandardOutput=syslog
+ StandardError=syslog
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 35ec4018c9b645da464fd1a66c7e5237c162521e..3ab159a06113a0757da35b97c1c42d47020c3c1d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 fix-systemd-service-depends.patch
-remove-systemd-delegate-flag.patch
 use-forking-systemd-service.patch
+remove-systemd-delegate-flag.patch
 run-lxcnetaddbr.patch
 deny-rw-mounting-of-sys-and-proc.patch
 0001-separate-the-limiting-from-the-namespaced-cgroup-roo.patch