From: Robert Milasan Date: Thu, 22 Nov 2012 16:47:47 +0000 (+0100) Subject: fix defaultcgroup detection (better description) X-Git-Tag: v0.41~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9659403b713f947fb4c1518c7417173623ddded8;p=thirdparty%2Flibcgroup.git fix defaultcgroup detection (better description) 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. Signed-off-by: Robert Milasan Signed-off-by: Jan Safranek --- diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in index 14aa2e3a..f299d0ff 100644 --- a/scripts/init.d/cgconfig.in +++ b/scripts/init.d/cgconfig.in @@ -51,8 +51,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"