From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BE04E13877A for ; Thu, 10 Jul 2014 17:08:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59350E09D5; Thu, 10 Jul 2014 17:08:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7118E09D5 for ; Thu, 10 Jul 2014 17:08:29 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F15133FD6E for ; Thu, 10 Jul 2014 17:08:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 38BA8193E5 for ; Thu, 10 Jul 2014 17:08:27 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1405007876.75e06d85584fc3ebfa26fbca97ea60b687247bb0.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/runscript.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 75e06d85584fc3ebfa26fbca97ea60b687247bb0 X-VCS-Branch: master Date: Thu, 10 Jul 2014 17:08:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c1679557-a34c-4c49-8e03-3c65407f2125 X-Archives-Hash: b091e4d6ea0f28dff0b2c69b041f57e3 commit: 75e06d85584fc3ebfa26fbca97ea60b687247bb0 Author: William Hubbs gmail com> AuthorDate: Thu Jul 10 10:18:00 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jul 10 15:57:56 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=75e06d85 Style Fixes --- sh/runscript.sh.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index c72a784..9b2ae0e 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -216,12 +216,12 @@ fi # Apply cgroups settings if defined if [ "$1" = "start" ] ; then -if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then - cgroup_add_service /sys/fs/cgroup/openrc - cgroup_add_service /sys/fs/cgroup/systemd/system -fi -[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] && \ - cgroup_set_limits + if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then + cgroup_add_service /sys/fs/cgroup/openrc + cgroup_add_service /sys/fs/cgroup/systemd/system + fi + [ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] && \ + cgroup_set_limits fi # Load our script