diff -Nru systemd-225/debian/changelog systemd-225/debian/changelog
--- systemd-225/debian/changelog 2015-09-01 07:20:04.000000000 -0500
+++ systemd-225/debian/changelog 2015-09-03 12:05:34.000000000 -0500
@@ -1,3 +1,11 @@
+systemd (225-1ubuntu2) wily; urgency=medium
+
+ * Ignore init when doing cg_migrate_everywhere. Otherwise, inside a
+ container using lxcfs, init can get trapped in the slice, and there's
+ simply no reason to do this in the first place. (LP: #1491557)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 02 Sep 2015 10:58:51 -0500
+
systemd (225-1ubuntu1) wily; urgency=medium
* Merge with Debian unstable (FFE: LP: #1489702). Remaining Ubuntu changes:
diff -Nru systemd-225/debian/patches/dont-migrate-init.patch systemd-225/debian/patches/dont-migrate-init.patch
--- systemd-225/debian/patches/dont-migrate-init.patch 1969-12-31 18:00:00.000000000 -0600
+++ systemd-225/debian/patches/dont-migrate-init.patch 2015-09-02 10:58:45.000000000 -0500
@@ -0,0 +1,22 @@
+Index: systemd-225/src/basic/cgroup-util.c
+===================================================================
+--- systemd-225.orig/src/basic/cgroup-util.c
++++ systemd-225/src/basic/cgroup-util.c
+@@ -1857,7 +1857,7 @@ int cg_migrate_everywhere(CGroupControll
+ int r;
+
+ if (!path_equal(from, to)) {
+- r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, false, true);
++ r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, true, true);
+ if (r < 0)
+ return r;
+ }
+@@ -1872,7 +1872,7 @@ int cg_migrate_everywhere(CGroupControll
+ if (!p)
+ p = to;
+
+- cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, to, n, p, false, false);
++ cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, to, n, p, true, false);
+ }
+
+ bit <<= 1;
diff -Nru systemd-225/debian/patches/series systemd-225/debian/patches/series
--- systemd-225/debian/patches/series 2015-09-01 07:20:04.000000000 -0500
+++ systemd-225/debian/patches/series 2015-09-02 10:53:05.000000000 -0500
@@ -43,3 +43,4 @@
Get-RTC-is-in-local-time-setting-from-etc-default-rc.patch
core-Put-session-scopes-into-all-cgroup-controllers.patch
udev-trigger-Drop-hwdb-update-dependency.patch
+dont-migrate-init.patch