Merge lp:~serge-hallyn/ubuntu/natty/libcgroup/fix-purge into lp:ubuntu/natty/libcgroup

[Serge Hallyn]

[Dave Walker (davewalker)]

Looks good to me. Uploading, thanks.

review: Approve

Unmerged revisions

8. By Serge Hallyn on 2011-04-22

Don't fail cgconfig stop on account of the umount. (LP: #769025)

=== modified file 'debian/cgroup-bin.cgconfig.upstart'
--- debian/cgroup-bin.cgconfig.upstart	2011-02-17 18:03:17 +0000
+++ debian/cgroup-bin.cgconfig.upstart	2011-04-22 19:46:24 +0000
@@ -22,6 +22,6 @@
 end script
 
 post-stop script
-	umount /sys/fs/cgroup
+	umount /sys/fs/cgroup || true
 	/usr/sbin/cgclear
 end script

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-17 18:03:17 +0000
+++ debian/changelog	2011-04-22 19:46:24 +0000
@@ -1,3 +1,9 @@
+libcgroup (0.37.1-1ubuntu2) natty; urgency=low
+
+  * Don't fail cgconfig stop on account of the umount.  (LP: #769025)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 22 Apr 2011 11:06:38 -0500
+
 libcgroup (0.37.1-1ubuntu1) natty; urgency=low
 
   * Mount a tmpfs at /sys/fs/cgroup so cgred can create subdirs.  Otherwise