Merge lp:~xnox/upstart/fix-user-cgroup into lp:upstart/async

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

LGTM.

review: Approve

=== modified file 'init/cgroup.c'
--- init/cgroup.c	2014-06-02 22:19:01 +0000
+++ init/cgroup.c	2014-06-04 16:15:49 +0000
@@ -54,6 +54,8 @@
 
 #include <cgmanager/cgmanager-client.h>
 
+extern int          user_mode;
+
 /**
  * disable_cgroups:
  *
@@ -1061,23 +1063,26 @@
 	nih_assert (path);
 	nih_assert (cgroup_manager);
 
-	pid = getpid ();
-
-	/* Escape our existing cgroup for this controller by moving to
-	 * the root cgroup to avoid creating groups below the current
-	 * cgroup.
-	 */
-	ret = cgmanager_move_pid_abs_sync (NULL,
-			cgroup_manager,
-			controller,
-			UPSTART_CGROUP_ROOT,
-			pid);
-
-	if (ret < 0)
-		return FALSE;
-
-	nih_debug ("Moved pid %d to root of '%s' controller cgroup",
-			pid, controller);
+	if (!user_mode) {
+		pid = getpid ();
+
+		/* Escape our existing cgroup for this controller by moving to
+		 * the root cgroup to avoid creating groups below the current
+		 * cgroup.
+		 */
+		ret = cgmanager_move_pid_abs_sync (NULL,
+						   cgroup_manager,
+						   controller,
+						   UPSTART_CGROUP_ROOT,
+						   pid);
+
+
+		if (ret < 0)
+			return FALSE;
+
+		nih_debug ("Moved pid %d to root of '%s' controller cgroup",
+			   pid, controller);
+	}
 
 
 	/* Ask cgmanager to create the cgroup */