[libcgroup/f14/master] Add /cgroup directory back, systemd was kicked out of F14 Resolves: #640282

[Jan Šafránek]

commit c80c73de8cef8f29e2a086054ed49e57c452cf07
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Tue Oct 5 15:22:56 2010 +0200

    Add /cgroup directory back, systemd was kicked out of F14
    Resolves: #640282

 fedora-config.patch |   20 ++++++++++----------
 libcgroup.spec      |    9 ++++++++-
 2 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/fedora-config.patch b/fedora-config.patch
index 16938a7..aa0072e 100644
--- a/fedora-config.patch
+++ b/fedora-config.patch
@@ -45,18 +45,18 @@ diff -up libcgroup-0.34/samples/cgconfig.conf.orig libcgroup-0.34/samples/cgconf
 -#	cpuacct = /mnt/cgroups/cpuacct;
 -#}
 +# By default, mount all separately controllers
-+# to /sys/fs/cgroup/<controller name>
++# to /cgroup/<controller name>
 +
 +mount {
-+	cpuset	= /sys/fs/cgroup/cpuset;
-+	cpu	= /sys/fs/cgroup/cpu;
-+	cpuacct	= /sys/fs/cgroup/cpuacct;
-+	memory	= /sys/fs/cgroup/memory;
-+	devices	= /sys/fs/cgroup/devices;
-+	freezer	= /sys/fs/cgroup/freezer;
-+	net_cls	= /sys/fs/cgroup/net_cls;
-+	ns	= /sys/fs/cgroup/ns;
-+	blkio	= /sys/fs/cgroup/blkio;
++	cpuset	= /cgroup/cpuset;
++	cpu	= /cgroup/cpu;
++	cpuacct	= /cgroup/cpuacct;
++	memory	= /cgroup/memory;
++	devices	= /cgroup/devices;
++	freezer	= /cgroup/freezer;
++	net_cls	= /cgroup/net_cls;
++	ns	= /cgroup/ns;
++	blkio	= /cgroup/blkio;
 +}
 +
 diff -up libcgroup-0.35.1/samples/cgconfig.sysconfig.orig libcgroup-0.35.1/samples/cgconfig.sysconfig
diff --git a/libcgroup.spec b/libcgroup.spec
index 34d8937..b2a8c25 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -5,7 +5,7 @@ Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.36.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
@@ -86,6 +86,9 @@ ln -sf libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.%{soversio
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+# pre-create /cgroup directory
+mkdir $RPM_BUILD_ROOT/cgroup
+
 # install README.Fedora
 cp %SOURCE1 .
 
@@ -132,6 +135,7 @@ fi
 %attr(0755,root,root) %{_initrddir}/cgconfig
 %attr(0755,root,root) %{_initrddir}/cgred
 %doc COPYING INSTALL README_daemon README.Fedora
+%attr(0755,root,root) %dir /cgroup
 
 %files pam
 %defattr(-,root,root,-)
@@ -146,6 +150,9 @@ fi
 %doc COPYING INSTALL 
 
 %changelog
+* Tue Oct  5 2010 Jan Safranek <jsafrane at redhat.com> 0.36.2-5
+- Add /cgroup directory back, systemd was kicked out of F14 (#640282)
+
 * Fri Sep  3 2010 Jan Safranek <jsafrane at redhat.com> 0.36.2-4
 - Removed /cgroup directory, everything is in /sys/fs/cgroup now.