diff --git a/common/run-in-cgroup.sh b/common/run-in-cgroup.sh
index 9891d72..8794cd4 100755
--- a/common/run-in-cgroup.sh
+++ b/common/run-in-cgroup.sh
@@ -7,13 +7,29 @@ fi
 
 set +e
 
-if type systemd-run >/dev/null 2>&1 ; then
-	sudo systemd-run -G --pty -d --uid=$(whoami) -p AllowedCPUs="$CPUSPEC" "$@"
-else
-	sudo mkdir /sys/fs/cgroup/jhalfs
-	sudo sh -c "echo +cpuset > /sys/fs/cgroup/cgroup.subtree_control"
-	sudo sh -c "echo \"$CPUSPEC\" > /sys/fs/cgroup/jhalfs/cpuset.cpus"
-	(sudo sh -c "echo $BASHPID > /sys/fs/cgroup/jhalfs/cgroup.procs" &&
-		exec "$@")
-	sudo rmdir /sys/fs/cgroup/jhalfs
+if type systemd-run >/dev/null 2>&1 ; then # systemd
+   sudo systemd-run -G --pty -d --uid=$(whoami)    \
+                    -p AllowedCPUs="$CPUSPEC"      \
+                    --slice "user-$(whoami).slice" \
+                    "$@"
+elif type loginctl >/dev/null 2>&1 ; then #elogind
+   sudo mkdir /sys/fs/cgroup/jhalfs
+   sudo sh -c "echo +cpuset > /sys/fs/cgroup/cgroup.subtree_control"
+   (
+      sudo sh -c "echo $BASHPID > /sys/fs/cgroup/jhalfs/cgroup.procs"
+      sudo -u $(whoami) sh <<EOF
+         SESS_CGROUP=/sys/fs/cgroup/\$XDG_SESSION_ID
+         sudo sh -c "echo \\"$CPUSPEC\\" > \$SESS_CGROUP/cpuset.cpus"
+         (sudo sh -c "echo \$BASHPID > \$SESS_CGROUP/cgroup.procs" &&
+            exec $@)
+EOF
+   )
+   sudo rmdir /sys/fs/cgroup/jhalfs
+else # no session manager
+   sudo mkdir /sys/fs/cgroup/jhalfs
+   sudo sh -c "echo +cpuset > /sys/fs/cgroup/cgroup.subtree_control"
+   sudo sh -c "echo \"$CPUSPEC\" > /sys/fs/cgroup/jhalfs/cpuset.cpus"
+   (sudo sh -c "echo $BASHPID > /sys/fs/cgroup/jhalfs/cgroup.procs" &&
+      exec "$@")
+   sudo rmdir /sys/fs/cgroup/jhalfs
 fi