Hello community, here is the log from the commit of package libcgroup for openSUSE:Factory checked in at 2015-01-29 13:18:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcgroup (Old) and /work/SRC/openSUSE:Factory/.libcgroup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcgroup" Changes: -------- --- /work/SRC/openSUSE:Factory/libcgroup/libcgroup.changes 2015-01-14 11:45:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcgroup.new/libcgroup.changes 2015-01-29 13:18:49.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 14 10:58:55 CET 2015 - [email protected] + +- add Require for post install scriptlets (bnc#912531) + +------------------------------------------------------------------- +Wed Jan 14 09:49:35 CET 2015 - [email protected] + +- cgconfig-Do-not-overwrite-defaultcgroup-configuratio.patch - cgconfig: + Do not overwrite defaultcgroup configuration (bnc#912487) + +------------------------------------------------------------------- New: ---- cgconfig-Do-not-overwrite-defaultcgroup-configuratio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcgroup.spec ++++++ --- /var/tmp/diff_new_pack.oaeAgp/_old 2015-01-29 13:18:50.000000000 +0100 +++ /var/tmp/diff_new_pack.oaeAgp/_new 2015-01-29 13:18:50.000000000 +0100 @@ -30,6 +30,7 @@ Patch5: initd_cgconfig.patch Patch6: initd_cgred.patch Patch9: do-not-version-pam-module.patch +Patch10: cgconfig-Do-not-overwrite-defaultcgroup-configuratio.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -39,6 +40,7 @@ BuildRequires: pam-devel BuildRequires: pkg-config Requires: insserv +Requires(post): %insserv_prereq %fillup_prereq Requires: pam BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +90,7 @@ %patch5 -p1 %patch6 -p1 %patch9 -p1 +%patch10 -p1 autoreconf -fvi %build ++++++ cgconfig-Do-not-overwrite-defaultcgroup-configuratio.patch ++++++ >From 1f56fee18da3d7b1039eea10cc5f6a01026f089b Mon Sep 17 00:00:00 2001 From: Michal Hocko <[email protected]> Date: Mon, 12 Jan 2015 15:47:08 +0100 Subject: [PATCH] cgconfig: Do not overwrite defaultcgroup configuration cpuset controller doesn't accept any tasks until cpuset.cpus and cpuset.mems are configured. cgconfig init script tries to create and configure defaultcgroup when enabled but it doesn't check whether the defaultcgroup already exists and it is configured from /etc/cgconfig.conf and happily overwrites the configuration. This is clearly wrong. Fix this simply by checking both knobs and inherit the value from root only when uninitialized. Signed-off-by: Michal Hocko <[email protected]> --- scripts/init.d/cgconfig.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in index f299d0ff3f73..45b370266f0c 100644 --- a/scripts/init.d/cgconfig.in +++ b/scripts/init.d/cgconfig.in @@ -78,13 +78,21 @@ create_default_groups() { cgcreate -f 664 -d 775 -g $controllers:$defaultcgroup 2>/dev/null # - # special rule for cpusets + # cpusets need cpus and mems to initialized which is not the case + # for the freshly created groups. Inherit values from / if the + # defaultcgroup is not initialized # if echo $controllers | grep -q -w cpuset; then - cpus=`cgget -nv -r cpuset.cpus /` - cgset -r cpuset.cpus=$cpus $defaultcgroup - mems=`cgget -nv -r cpuset.mems /` - cgset -r cpuset.mems=$mems $defaultcgroup + if [ -z "`cgget -nv -r cpuset.cpus $defaultcgroup`" ] + then + cpus=`cgget -nv -r cpuset.cpus /` + cgset -r cpuset.cpus=$cpus $defaultcgroup + fi + if [ -z "`cgget -nv -r cpuset.mems $defaultcgroup`" ] + then + mems=`cgget -nv -r cpuset.mems /` + cgset -r cpuset.mems=$mems $defaultcgroup + fi fi # -- 2.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
