Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2012-03-07 13:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2012-01-11 15:38:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2012-03-07 13:43:21.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 21:11:54 CET 2012 - [email protected] + +- Accurately detect whether a system supports clone_children + (bnc#750470) + +------------------------------------------------------------------- New: ---- Accurately-detect-whether-a-system-supports-clone_children.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.6lWAo4/_old 2012-03-07 13:43:22.000000000 +0100 +++ /var/tmp/diff_new_pack.6lWAo4/_new 2012-03-07 13:43:22.000000000 +0100 @@ -15,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: lxc Version: 0.7.5 -Release: 2 +Release: 0 Url: http://lxc.sourceforge.net/ Summary: Linux containers implementation -Group: System/Management -AutoReqProv: on License: LGPL-2.1+ +Group: System/Management Source: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz Source1: README.SUSE # PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 Patch0: lxc-opensuse-12.1.patch # PATCH-FIX-UPSTREAM lxc-checkconfig-kernel-3.patch bnc#720845 [email protected] -- correctly detect kernel 3.x Patch1: lxc-checkconfig-kernel-3.patch +Patch2: Accurately-detect-whether-a-system-supports-clone_children.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: docbook-utils libcap-devel pkg-config +BuildRequires: docbook-utils +BuildRequires: libcap-devel +BuildRequires: pkg-config %if 0%{?suse_version} >= 1130 BuildRequires: linux-glibc-devel %else @@ -53,10 +53,10 @@ applications like bash or sshd. %package devel -License: LGPL-2.1 Summary: Development library for lxc -Requires: %name = %version glibc-devel +License: LGPL-2.1 Group: Development/Libraries/C and C++ +Requires: %name = %version glibc-devel %description devel Lxc header files and library needed for development of containers. @@ -65,6 +65,7 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --disable-examples ++++++ Accurately-detect-whether-a-system-supports-clone_children.patch ++++++ >From 3e2981d4599962ec069c249460d86ce8ebec7644 Mon Sep 17 00:00:00 2001 From: Serge E. Hallyn <[email protected]> Date: Mon, 24 Oct 2011 14:38:30 +0200 Subject: Accurately detect whether a system supports clone_children Patch-upstream: yes If multiple cgroups are mounted under /sys/fs/cgroup, then the original check ends up looking for /sys/fs/cgroup/cgroup.clone_children, which does not exist because that is just a tmpfs. So make sure to check an actual cgroupfs. Signed-off-by: Serge Hallyn <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> --- src/lxc/lxc-checkconfig.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in index 5dcf3a4..30f6186 100755 --- a/src/lxc/lxc-checkconfig.in +++ b/src/lxc/lxc-checkconfig.in @@ -63,7 +63,12 @@ echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES echo echo "--- Control groups ---" -CGROUP_MNT_PATH=$(grep -m1 "^cgroup" /proc/self/mounts | awk '{ print $2 }') +print_cgroups() { + # print all mountpoints for cgroup filesystems + awk '$1 !~ /#/ && $3 == mp { print $2; } ; END { exit(0); } ' "mp=$1" "$2" ; +} + +CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -1` echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes -- 1.7.4.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
