diff -Nru cgroup-lite-1.11/debian/changelog cgroup-lite-1.11ubuntu0.16.10.1/debian/changelog --- cgroup-lite-1.11/debian/changelog 2016-03-02 06:27:35.000000000 +0000 +++ cgroup-lite-1.11ubuntu0.16.10.1/debian/changelog 2017-03-21 13:18:25.000000000 +0000 @@ -1,3 +1,9 @@ +cgroup-lite (1.11ubuntu0.16.10.1) yakkety-proposed; urgency=medium + + * Handle mounting comounted cgroup controllers (LP: #1668724) + + -- Serge Hallyn Mon, 06 Mar 2017 22:32:25 -0600 + cgroup-lite (1.11) xenial; urgency=medium * Mount name=systemd (LP: #1551923) diff -Nru cgroup-lite-1.11/scripts/cgroups-mount cgroup-lite-1.11ubuntu0.16.10.1/scripts/cgroups-mount --- cgroup-lite-1.11/scripts/cgroups-mount 2016-03-02 06:27:25.000000000 +0000 +++ cgroup-lite-1.11ubuntu0.16.10.1/scripts/cgroups-mount 2017-03-07 04:33:04.000000000 +0000 @@ -22,7 +22,18 @@ mountpoint -q /sys/fs/cgroup || mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup # get list of cgroup kernel controllers -for d in `sed -e '1d;s/\([^\t]\)\t.*$/\1/' /proc/cgroups`; do +for d in `tail -n +2 /proc/cgroups | awk '{ + if ($2 == 0) + print $1 + else 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