diff -Nru cgroup-lite-1.1.1/debian/changelog cgroup-lite-1.1.2/debian/changelog --- cgroup-lite-1.1.1/debian/changelog 2012-06-21 15:58:49.000000000 +0000 +++ cgroup-lite-1.1.2/debian/changelog 2012-07-05 17:00:00.000000000 +0000 @@ -1,3 +1,11 @@ +cgroup-lite (1.1.2) precise-proposed; urgency=low + + * Complete the fix for separate /usr (LP: #989354) + - replace use of tail and awk with sed. + - use echo instead of logger + + -- Serge Hallyn Thu, 05 Jul 2012 11:46:30 -0500 + cgroup-lite (1.1.1) precise-proposed; urgency=low * move cgroups-mount and cgroups-umount to /bin, with links in /usr diff -Nru cgroup-lite-1.1.1/scripts/cgroups-mount cgroup-lite-1.1.2/scripts/cgroups-mount --- cgroup-lite-1.1.1/scripts/cgroups-mount 2012-06-20 17:56:20.000000000 +0000 +++ cgroup-lite-1.1.2/scripts/cgroups-mount 2012-07-05 16:59:46.000000000 +0000 @@ -14,13 +14,13 @@ # If cgroup is mounted by fstab, don't run # Don't get too smart - bail on any uncommented entry with 'cgroup' in it if grep -v '^#' /etc/fstab | grep -q cgroup; then - logger -t cgroup-lite "cgroups mounted from fstab, not mounting /sys/fs/cgroup" + echo "cgroups mounted from fstab, not mounting /sys/fs/cgroup" exit 0 fi # Some sites mount cgroups themselves. Don't run in that case if grep -q cgroup /proc/mounts; then - logger -t cgroup-lite "cgroups mounted (non-standard) according to /proc/mounts" + echo "cgroups mounted (non-standard) according to /proc/mounts" exit 0 fi @@ -32,9 +32,9 @@ mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup # get list of cgroup controllers -for c in `tail -n +2 /proc/cgroups | awk '{ print $1 }'`; do - mkdir /sys/fs/cgroup/$c - mount -n -t cgroup -o $c cgroup /sys/fs/cgroup/$c +for d in `sed -e '1d;s/\([^\t]\)\t.*$/\1/' /proc/cgroups`; do + mkdir /sys/fs/cgroup/$d + mount -n -t cgroup -o $d cgroup /sys/fs/cgroup/$d done exit 0 diff -Nru cgroup-lite-1.1.1/scripts/cgroups-umount cgroup-lite-1.1.2/scripts/cgroups-umount --- cgroup-lite-1.1.1/scripts/cgroups-umount 2012-06-20 17:59:55.000000000 +0000 +++ cgroup-lite-1.1.2/scripts/cgroups-umount 2012-07-05 17:09:50.000000000 +0000 @@ -18,7 +18,7 @@ exit 0 fi cd /sys/fs/cgroup -for d in `tail -n +2 /proc/cgroups | awk '{ print $1 }'`; do +for d in `sed -e '1d;s/\([^\t]\)\t.*$/\1/' /proc/cgroups`; do [ -d $d ] && umount $d || true done