Instead of managing cgroup via /etc/fstab ourselves, let the
cgroup-lite package do it.
Change-Id: I3c4b8e6583bcf644f3840819bdad972c3b52f088
| ... | ... |
@@ -719,15 +719,17 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then |
| 719 | 719 |
# splitting a system into many smaller parts. LXC uses cgroups and chroot |
| 720 | 720 |
# to simulate multiple systems. |
| 721 | 721 |
if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then |
| 722 |
- apt_get install lxc |
|
| 723 |
- # lxc uses cgroups (a kernel interface via virtual filesystem) configured |
|
| 724 |
- # and mounted to ``/cgroup`` |
|
| 725 |
- sudo mkdir -p /cgroup |
|
| 726 |
- if ! grep -q cgroup /etc/fstab; then |
|
| 727 |
- echo none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0 | sudo tee -a /etc/fstab |
|
| 728 |
- fi |
|
| 729 |
- if ! mount -n | grep -q cgroup; then |
|
| 730 |
- sudo mount /cgroup |
|
| 722 |
+ if [[ "$DISTRO" > natty ]]; then |
|
| 723 |
+ apt_get install cgroup-lite |
|
| 724 |
+ else |
|
| 725 |
+ cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0" |
|
| 726 |
+ sudo mkdir -p /cgroup |
|
| 727 |
+ if ! grep -q cgroup /etc/fstab; then |
|
| 728 |
+ echo "$cgline" | sudo tee -a /etc/fstab |
|
| 729 |
+ fi |
|
| 730 |
+ if ! mount -n | grep -q cgroup; then |
|
| 731 |
+ sudo mount /cgroup |
|
| 732 |
+ fi |
|
| 731 | 733 |
fi |
| 732 | 734 |
fi |
| 733 | 735 |
|