Ubuntu
libcgroup package

Merge lp:~serge-hallyn/ubuntu/precise/libcgroup/fix-cgrouplite-fstab into lp:ubuntu/precise/libcgroup

  1. Precise (12.04)
  2. fix-cgrouplite-fstab
  3. Merge into precise
Proposed by Serge Hallyn
Status: Merged
Merge reported by: Stéphane Graber
Merged at revision: not available
Proposed branch: lp:~serge-hallyn/ubuntu/precise/libcgroup/fix-cgrouplite-fstab
Merge into: lp:ubuntu/precise/libcgroup
Diff against target: 33 lines (+15/-0)
2 files modified
debian/cgroup-lite.cgroups-mount (+8/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/precise/libcgroup/fix-cgrouplite-fstab
Reviewer Review Type Date Requested Status
Stéphane Graber Pending
Review via email: mp+83062@code.launchpad.net
To post a comment you must log in.
lp:~serge-hallyn/ubuntu/precise/libcgroup/fix-cgrouplite-fstab updated
15. By root <root@serge-laptop>

send msg to syslog if cgroups are mounted through fstab

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/cgroup-lite.cgroups-mount'
2--- debian/cgroup-lite.cgroups-mount 2011-09-01 15:32:25 +0000
3+++ debian/cgroup-lite.cgroups-mount 2011-11-22 22:58:23 +0000
4@@ -9,6 +9,14 @@
5 exit 0
6 fi
7
8+# If cgroup is mounted by fstab, don't run
9+# Don't get too smart - bail on any uncommented entry with 'cgroup' in it
10+grep -v '^#' /etc/fstab | grep -q cgroup
11+if [ $? -eq 0 ]; then
12+ logger -t cgroup-lite "cgroups mounted from fstab, not mounting /sys/fs/cgroup"
13+ exit 0
14+fi
15+
16 # kernel provides cgroups?
17 if [ ! -e /proc/cgroups ]; then
18 exit 0
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2011-09-02 16:35:03 +0000
22+++ debian/changelog 2011-11-22 22:58:23 +0000
23@@ -1,3 +1,10 @@
24+libcgroup (0.37.1-1ubuntu8) precise; urgency=low
25+
26+ * debian/cgroup-lite.cgroups-mount: don't run if cgroups are mounted by
27+ fstab. (LP: #893550)
28+
29+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 22 Nov 2011 12:26:40 -0600
30+
31 libcgroup (0.37.1-1ubuntu7) oneiric; urgency=low
32
33 * Replace broken /etc/init/libvirt-cgred-wait.conf with (hopefully much

Subscribers

People subscribed via source and target branches

to all changes: