diff --git a/libcgroup-0.41-api.c-preserve-dirty-flag.patch b/libcgroup-0.41-api.c-preserve-dirty-flag.patch new file mode 100644 index 0000000..0836334 --- /dev/null +++ b/libcgroup-0.41-api.c-preserve-dirty-flag.patch @@ -0,0 +1,33 @@ +From ad27a46d8c0e180f71b4606d7b2a3bd3bebd7bbf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Thu, 13 Oct 2016 13:42:30 +0200 +Subject: [PATCH] api.c: preserve dirty flag when copying controller values +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When setting cgroup parameters with cgset fails, no error is reported. +This is caused by the fact that cgroup_copy_controller_values is not +preserving dirty flags of the values, so it's making all errors +considered non-fatal. + +Signed-off-by: Nikola Forró +--- + src/api.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/api.c b/src/api.c +index 0bf0615..daf4ef0 100644 +--- a/src/api.c ++++ b/src/api.c +@@ -1687,6 +1687,7 @@ static int cgroup_copy_controller_values(struct cgroup_controller *dst, + dst_val = dst->values[i]; + strncpy(dst_val->value, src_val->value, CG_VALUE_MAX); + strncpy(dst_val->name, src_val->name, FILENAME_MAX); ++ dst_val->dirty = src_val->dirty; + } + err: + return ret; +-- +2.7.4 + diff --git a/libcgroup.spec b/libcgroup.spec index 5c044d7..fc43f65 100644 --- a/libcgroup.spec +++ b/libcgroup.spec @@ -5,7 +5,7 @@ Summary: Library to control and monitor control groups Name: libcgroup Version: 0.41 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libcg.sourceforge.net/ @@ -21,6 +21,8 @@ Patch5: libcgroup-0.41-lex.patch Patch6: libcgroup-0.41-api.c-support-for-setting-multiline-values-in-contro.patch # resolves #1348874 Patch7: libcgroup-0.41-api.c-fix-order-of-memory-subsystem-parameters.patch +# resolves #1384504 +Patch8: libcgroup-0.41-api.c-preserve-dirty-flag.patch BuildRequires: byacc, coreutils, flex, pam-devel, systemd-units Requires(pre): shadow-utils @@ -70,6 +72,7 @@ provide scripts to manage that configuration. %patch5 -p2 -b .lex %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build %configure --enable-pam-module-dir=%{_libdir}/security \ @@ -170,6 +173,10 @@ getent group cgred >/dev/null || groupadd -r cgred %{_libdir}/pkgconfig/libcgroup.pc %changelog +* Thu Oct 13 2016 Nikola Forró - 0.41-10 +- resolves: #1384504 + api.c: preserve dirty flag when copying controller values + * Fri Jul 01 2016 Nikola Forró - 0.41-9 - resolves: #1348874 api.c: fix order of memory subsystem parameters generated by cgsnapshot