diff -Nru cgroup-lite-1.12/debian/changelog cgroup-lite-1.12+nmu1/debian/changelog --- cgroup-lite-1.12/debian/changelog 2016-10-19 05:58:01.000000000 -0700 +++ cgroup-lite-1.12+nmu1/debian/changelog 2017-02-28 11:50:01.000000000 -0800 @@ -1,3 +1,10 @@ +cgroup-lite (1.12+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Handle mounting comounted cgroup controllers + + -- Cameron Cope Tue, 28 Feb 2017 11:48:05 -0800 + cgroup-lite (1.12) zesty; urgency=medium * Drop /usr/bin symlinks to binaries in /bin, to prepare ourselves for a diff -Nru cgroup-lite-1.12/scripts/cgroups-mount cgroup-lite-1.12+nmu1/scripts/cgroups-mount --- cgroup-lite-1.12/scripts/cgroups-mount 2016-03-01 22:27:25.000000000 -0800 +++ cgroup-lite-1.12+nmu1/scripts/cgroups-mount 2017-02-28 12:25:13.000000000 -0800 @@ -22,7 +22,7 @@ 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(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