diff options
Diffstat (limited to 'app-admin/cgmanager/files')
-rw-r--r-- | app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch | 31 | ||||
-rw-r--r-- | app-admin/cgmanager/files/cgmanager.initd-r1 | 14 | ||||
-rw-r--r-- | app-admin/cgmanager/files/cgproxy.initd-r1 | 27 |
3 files changed, 72 insertions, 0 deletions
diff --git a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch new file mode 100644 index 000000000000..eed626f3e68c --- /dev/null +++ b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch @@ -0,0 +1,31 @@ +--- Makefile.am.old 2015-09-06 00:16:38.997836415 +0800 ++++ Makefile.am 2015-09-06 01:05:00.376009752 +0800 +@@ -133,6 +133,7 @@ + $(CCLD) -o tests/cgm-concurrent tests/cgm-concurrent.o \ + $(NIH_LIBS) $(NIH_DBUS_LIBS) $(DBUS_LIBS) -lpthread -lcgmanager + ++if HAVE_PAMMODULE + pam_LTLIBRARIES = pam_cgm.la + pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h + pam_cgm_la_CFLAGS = $(AM_CFLAGS) +@@ -145,4 +146,6 @@ + rm -f "$(DESTDIR)$(pamdir)/pam_cgm.a" + uninstall-local: + rm -f "$(DESTDIR)$(pamdir)/pam_cgm.so" ++endif ++ + tests: TESTS_CGM_CONCURRENT TESTS_SCM TEST_NSTEST +--- configure.ac.old 2015-09-06 00:55:48.262972928 +0800 ++++ configure.ac 2015-09-06 01:04:19.683301852 +0800 +@@ -127,6 +127,11 @@ + + AS_AC_EXPAND(SBINDIR, "$sbindir") + ++AC_ARG_ENABLE(pam-module, ++ [AS_HELP_STRING([--enable-pam-module],[build PAM module])], ++ , enable_pam_module=no) ++AM_CONDITIONAL([HAVE_PAMMODULE], [test "x$enable_pam_module" != "xno" ]) ++ + AC_ARG_WITH( + [pamdir], + [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])], diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1 new file mode 100644 index 000000000000..6efc80b7155a --- /dev/null +++ b/app-admin/cgmanager/files/cgmanager.initd-r1 @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Control Group manager daemon" +pidfile="/run/cgmanager.pid" +command="/usr/sbin/cgmanager" +command_args="-m name=systemd" +command_background="yes" +retry="TERM/45" + +depend() { + before cgproxy +} diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1 new file mode 100644 index 000000000000..ceb075254a3f --- /dev/null +++ b/app-admin/cgmanager/files/cgproxy.initd-r1 @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Control Group manager proxy" +pidfile="/run/cgproxy.pid" +command="/usr/sbin/cgproxy" +command_args="--daemon" +command_background="yes" +retry="TERM/45" +NESTED="${NESTED:-no}" + +depend() { + after cgmanager +} + +start_pre() { + if ! /usr/sbin/cgproxy --check-master; then + ewarn "cgmanager is not running" + return 1 + fi + # cgproxy should only run on container unless on older kernel + if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then + eerror "Too old kernel to support cgroup, please update to >3.8" + return 1 + fi +} |