From 464932ee1977029d2cd3abfb04351c40c7775396 Mon Sep 17 00:00:00 2001 From: Sven Jonsson Date: Sat, 24 Dec 2016 09:38:04 +0100 Subject: [PATCH] libcgroup: fix cgred service (#5346) Updated the service according to "https://forum.voidlinux.eu/t/unpriviledged-linux-container/1124/4" This is necessary to get /etc/cgconfig.conf loaded. --- srcpkgs/libcgroup/files/cgred/run | 5 +++-- srcpkgs/libcgroup/template | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libcgroup/files/cgred/run b/srcpkgs/libcgroup/files/cgred/run index 701b542c5bb..7b621d762c6 100755 --- a/srcpkgs/libcgroup/files/cgred/run +++ b/srcpkgs/libcgroup/files/cgred/run @@ -1,5 +1,6 @@ #!/bin/sh # Default logs to syslog with facility DAEMON # man cgrulesengd for options list and descriptions. -: ${OPTS:=-s} -exec cgrulesengd $OPTS -g cgred --nodaemon 2>&1 +[ -r conf ] && . ./conf +cgconfigparser ${PARSEOPTS:=-l /etc/cgconfig.conf} +exec cgrulesengd ${OPTS:=-s} -g cgred --nodaemon 2>&1 diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template index e8a65824144..02d46c314aa 100644 --- a/srcpkgs/libcgroup/template +++ b/srcpkgs/libcgroup/template @@ -1,7 +1,7 @@ # Template file for 'libcgroup' pkgname=libcgroup version=0.41 -revision=6 +revision=7 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security" hostmakedepends="flex automake libtool"