diff -Nru cgroup-lite-1.1.5/debian/changelog cgroup-lite-1.1.5+nmu1/debian/changelog --- cgroup-lite-1.1.5/debian/changelog 2014-01-07 07:09:21.000000000 -0800 +++ cgroup-lite-1.1.5+nmu1/debian/changelog 2017-02-28 11:48:57.000000000 -0800 @@ -1,3 +1,11 @@ +cgroup-lite (1.1.5+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Handle mounting comounted cgroup controllers + * Mount the systemd cgroup + + -- Cameron Cope Tue, 28 Feb 2017 11:28:22 -0800 + cgroup-lite (1.1.5) precise-proposed; urgency=medium * Fix missing whitespace in upstart script. diff -Nru cgroup-lite-1.1.5/scripts/cgroups-mount cgroup-lite-1.1.5+nmu1/scripts/cgroups-mount --- cgroup-lite-1.1.5/scripts/cgroups-mount 2013-12-18 09:47:28.000000000 -0800 +++ cgroup-lite-1.1.5+nmu1/scripts/cgroups-mount 2017-02-28 12:22:40.000000000 -0800 @@ -33,9 +33,16 @@ mountpoint -q /sys/fs/cgroup || mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup # get list of cgroup controllers -for d in `sed -e '1d;s/\([^\t]\)\t.*$/\1/' /proc/cgroups`; do +for d in `tail -n +2 /proc/cgroups | awk '{if(a[$2])a[$2]=a[$2]","$1; else a[$2]=$1;};END{for(i in a){print a[i]}}'`; do mkdir -p /sys/fs/cgroup/$d mountpoint -q /sys/fs/cgroup/$d || (mount -n -t cgroup -o $d cgroup /sys/fs/cgroup/$d || rmdir /sys/fs/cgroup/$d || true) done +# Always mount name=systemd +dir="/sys/fs/cgroup/systemd" +if [ ! -d "${dir}" ]; then + mkdir "${dir}" + mount -n -t cgroup -o none,name=systemd name=systemd "${dir}" || rmdir "${dir}" || true +fi + exit 0