Hello community, here is the log from the commit of package libcgroup1 for openSUSE:Factory checked in at 2013-01-25 09:30:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcgroup1 (Old) and /work/SRC/openSUSE:Factory/.libcgroup1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcgroup1", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libcgroup1/libcgroup1.changes 2012-02-16 14:57:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcgroup1.new/libcgroup1.changes 2013-01-25 09:30:53.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 22 17:44:55 CET 2012 - [email protected] + +- initd_cgconfig-read-correctly-defaultcgroup.patch: fix defaultcgroup + detection (bnc#790934) + +------------------------------------------------------------------- New: ---- initd_cgconfig-read-correctly-defaultcgroup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcgroup1.spec ++++++ --- /var/tmp/diff_new_pack.TFXDiW/_old 2013-01-25 09:30:55.000000000 +0100 +++ /var/tmp/diff_new_pack.TFXDiW/_new 2013-01-25 09:30:55.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: libcgroup1 Version: 0.37.1 Release: 0 @@ -29,13 +28,15 @@ Patch5: initd_cgconfig.patch Patch6: initd_cgred.patch Patch7: libcgroup-man_pages.patch +Patch8: initd_cgconfig-read-correctly-defaultcgroup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: pam-devel BuildRequires: pkg-config -Requires: insserv pam +Requires: insserv +Requires: pam %description Control groups, a new kernel feature in Linux 2.6.24 provides a file @@ -73,6 +74,7 @@ %patch5 -p1 %patch6 -p1 %patch7 +%patch8 -p1 %build # only for GIT builds ++++++ initd_cgconfig-read-correctly-defaultcgroup.patch ++++++ From: Robert Milasan <[email protected]> Subject: fix defaultcgroup detection b55ce704 (scripts: cgconfig, cleanup) introduced a regression because read is now executed in a subshell so the variables are not visible in the outer context and so defaultcgtoup is never non-empty. Fix the issue by using here text which doesn't involve subshell. [[email protected]: tweaked changelog a bit] Signed-off-by: Robert Milasan <[email protected]> Index: libcgroup-0.37.1/scripts/init.d/cgconfig.in =================================================================== --- libcgroup-0.37.1.orig/scripts/init.d/cgconfig.in +++ libcgroup-0.37.1/scripts/init.d/cgconfig.in @@ -55,8 +55,8 @@ create_default_groups() { defaultcgroup= if [ -f /etc/cgrules.conf ]; then - grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \ - read user ctrl defaultcgroup + read user ctrl defaultcgroup <<< \ + $(grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf) if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then log_warning_msg "/etc/cgrules.conf incorrect" log_warning_msg "Overriding it" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
