diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-emulation/lxc/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-emulation/lxc/files')
8 files changed, 0 insertions, 399 deletions
diff --git a/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch deleted file mode 100644 index 3ec81356499e..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- /config/Makefile.am.orig 2016-05-19 02:56:11.891113982 +0000 -+++ /config/Makefile.am 2016-05-19 02:56:32.596115476 +0000 -@@ -1 +1 @@ --SUBDIRS = apparmor bash etc init selinux templates yum sysconfig -+SUBDIRS = apparmor bash etc init selinux templates yum diff --git a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch deleted file mode 100644 index 6033e36c7985..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/config/bash/lxc.in b/config/bash/lxc.in -index 7dcf302..5927fe2 100644 ---- a/config/bash/lxc.in -+++ b/config/bash/lxc.in -@@ -1,4 +1,3 @@ --_have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -100,4 +99,3 @@ _have lxc-start && { - - complete -o default -F _lxc_generic_o lxc-copy - complete -o default -F _lxc_generic_o lxc-start-ephemeral --} -diff --git a/configure.ac b/configure.ac -index 4640c0d..14ccdd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -478,7 +478,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) - AM_COND_IF([ENABLE_BASH], - [AC_MSG_CHECKING([bash completion directory]) - PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , -- bashcompdir="${sysconfdir}/bash_completion.d") -+ bashcompdir="$datadir/bash-completion/completions") - AC_MSG_RESULT([$bashcompdir]) - AC_SUBST(bashcompdir) - ]) diff --git a/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch b/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch deleted file mode 100644 index 8493491d0d65..000000000000 --- a/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch +++ /dev/null @@ -1,164 +0,0 @@ -From b635e92d21d2a4d71a553388f18cfa08f44bf1ba Mon Sep 17 00:00:00 2001 -From: Christian Brauner <christian.brauner@ubuntu.com> -Date: Mon, 30 Oct 2017 14:16:46 +0100 -Subject: [PATCH] cgroups: enable container without CAP_SYS_ADMIN - -In case cgroup namespaces are supported but we do not have CAP_SYS_ADMIN we -need to mount cgroups for the container. This patch enables both privileged and -unprivileged containers without CAP_SYS_ADMIN. - -Closes #1737. - -Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> ---- - src/lxc/cgroups/cgfs.c | 3 ++- - src/lxc/cgroups/cgfsng.c | 52 +++++++++++++++++++++++++++++++++++++++++++++--- - src/lxc/cgroups/cgroup.c | 2 +- - src/lxc/conf.c | 3 --- - src/lxc/conf.h | 1 + - 5 files changed, 53 insertions(+), 8 deletions(-) - -diff --git a/src/lxc/cgroups/cgfs.c b/src/lxc/cgroups/cgfs.c -index bcbd6613..efd627f0 100644 ---- a/src/lxc/cgroups/cgfs.c -+++ b/src/lxc/cgroups/cgfs.c -@@ -1418,11 +1418,12 @@ static bool cgroupfs_mount_cgroup(void *hdata, const char *root, int type) - struct cgfs_data *cgfs_d; - struct cgroup_process_info *info, *base_info; - int r, saved_errno = 0; -+ struct lxc_handler *handler = hdata; - - if (cgns_supported()) - return true; - -- cgfs_d = hdata; -+ cgfs_d = handler->cgroup_data; - if (!cgfs_d) - return false; - base_info = cgfs_d->info; -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index e43edd7d..ec6440c1 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -50,6 +50,7 @@ - #include <linux/types.h> - #include <linux/kdev_t.h> - -+#include "caps.h" - #include "cgroup.h" - #include "cgroup_utils.h" - #include "commands.h" -@@ -1616,17 +1617,49 @@ do_secondstage_mounts_if_needed(int type, struct hierarchy *h, - return 0; - } - -+static int mount_cgroup_cgns_supported(struct hierarchy *h, const char *controllerpath) -+{ -+ int ret; -+ char *controllers = NULL; -+ char *type = "cgroup2"; -+ -+ if (!h->is_cgroup_v2) { -+ controllers = lxc_string_join(",", (const char **)h->controllers, false); -+ if (!controllers) -+ return -ENOMEM; -+ type = "cgroup"; -+ } -+ -+ ret = mount("cgroup", controllerpath, type, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RELATIME, controllers); -+ free(controllers); -+ if (ret < 0) { -+ SYSERROR("Failed to mount %s with cgroup filesystem type %s", controllerpath, type); -+ return -1; -+ } -+ -+ DEBUG("Mounted %s with cgroup filesystem type %s", controllerpath, type); -+ return 0; -+} -+ - static bool cgfsng_mount(void *hdata, const char *root, int type) - { -- struct cgfsng_handler_data *d = hdata; -+ int i; - char *tmpfspath = NULL; - bool retval = false; -- int i; -+ struct lxc_handler *handler = hdata; -+ struct cgfsng_handler_data *d = handler->cgroup_data; -+ bool has_cgns = false, has_sys_admin = true; - - if ((type & LXC_AUTO_CGROUP_MASK) == 0) - return true; - -- if (cgns_supported()) -+ has_cgns = cgns_supported(); -+ if (!lxc_list_empty(&handler->conf->keepcaps)) -+ has_sys_admin = in_caplist(CAP_SYS_ADMIN, &handler->conf->keepcaps); -+ else -+ has_sys_admin = !in_caplist(CAP_SYS_ADMIN, &handler->conf->caps); -+ -+ if (has_cgns && has_sys_admin) - return true; - - tmpfspath = must_make_path(root, "/sys/fs/cgroup", NULL); -@@ -1662,6 +1695,19 @@ static bool cgfsng_mount(void *hdata, const char *root, int type) - free(controllerpath); - goto bad; - } -+ -+ if (has_cgns && !has_sys_admin) { -+ /* If cgroup namespaces are supported but the container -+ * will not have CAP_SYS_ADMIN after it has started we -+ * need to mount the cgroups manually. -+ */ -+ r = mount_cgroup_cgns_supported(h, controllerpath); -+ free(controllerpath); -+ if (r < 0) -+ goto bad; -+ continue; -+ } -+ - if (mount_cgroup_full(type, h, controllerpath, d->container_cgroup) < 0) { - free(controllerpath); - goto bad; -diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c -index 674e3090..36a665b1 100644 ---- a/src/lxc/cgroups/cgroup.c -+++ b/src/lxc/cgroups/cgroup.c -@@ -166,7 +166,7 @@ bool cgroup_chown(struct lxc_handler *handler) - bool cgroup_mount(const char *root, struct lxc_handler *handler, int type) - { - if (ops) -- return ops->mount_cgroup(handler->cgroup_data, root, type); -+ return ops->mount_cgroup(handler, root, type); - - return false; - } -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index d2fab945..44d97843 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -210,9 +210,6 @@ __thread struct lxc_conf *current_config; - struct lxc_conf *current_config; - #endif - --/* Declare this here, since we don't want to reshuffle the whole file. */ --static int in_caplist(int cap, struct lxc_list *caps); -- - static struct mount_opt mount_opt[] = { - { "async", 1, MS_SYNCHRONOUS }, - { "atime", 1, MS_NOATIME }, -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index c61f861e..63e71e2d 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -402,5 +402,6 @@ extern unsigned long add_required_remount_flags(const char *s, const char *d, - unsigned long flags); - extern int run_script(const char *name, const char *section, const char *script, - ...); -+extern int in_caplist(int cap, struct lxc_list *caps); - - #endif /* __LXC_CONF_H */ --- -2.13.6 - diff --git a/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch b/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch deleted file mode 100644 index c16d28ac3033..000000000000 --- a/app-emulation/lxc/files/lxc-2.1.1-fix-cgroup2-detection.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cdfe90a49f516b0f1210d181980f14a4765e10da Mon Sep 17 00:00:00 2001 -From: Christian Brauner <christian.brauner@ubuntu.com> -Date: Mon, 30 Oct 2017 14:17:20 +0100 -Subject: [PATCH] cgfsng: fix cgroup2 detection - -Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> ---- - src/lxc/cgroups/cgfsng.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 897336f0..e43edd7d 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -815,7 +815,7 @@ static void add_controller(char **clist, char *mountpoint, char *base_cgroup) - new->fullcgpath = NULL; - - /* record if this is the cgroup v2 hierarchy */ -- if (!strcmp(base_cgroup, "cgroup2")) -+ if (clist && !strcmp(*clist, "cgroup2")) - new->is_cgroup_v2 = true; - else - new->is_cgroup_v2 = false; --- -2.13.6 - diff --git a/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch b/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch deleted file mode 100644 index 2a08eedb1c2d..000000000000 --- a/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/config/bash/lxc.in b/config/bash/lxc.in -index 43056882..0a22d4ad 100644 ---- a/config/bash/lxc.in -+++ b/config/bash/lxc.in -@@ -1,4 +1,3 @@ --_have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -108,4 +107,3 @@ _have lxc-start && { - complete -o default -F _lxc_generic_t lxc-create - - complete -o default -F _lxc_generic_o lxc-copy --} -diff --git a/configure.ac b/configure.ac -index 50c99836..0569caec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -395,7 +395,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) - AM_COND_IF([ENABLE_BASH], - [AC_MSG_CHECKING([bash completion directory]) - PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , -- bashcompdir="${sysconfdir}/bash_completion.d") -+ bashcompdir="$datadir/bash-completion/completions") - AC_MSG_RESULT([$bashcompdir]) - AC_SUBST(bashcompdir) - ]) diff --git a/app-emulation/lxc/files/lxc.initd.7 b/app-emulation/lxc/files/lxc.initd.7 deleted file mode 100644 index 6a42b6aac520..000000000000 --- a/app-emulation/lxc/files/lxc.initd.7 +++ /dev/null @@ -1,124 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONTAINER=${SVCNAME#*.} - -LXC_PATH=`lxc-config lxc.lxcpath` - -lxc_get_configfile() { - if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then - echo "${LXC_PATH}/${CONTAINER}.conf" - elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then - echo "${LXC_PATH}/${CONTAINER}/config" - else - eerror "Unable to find a suitable configuration file." - eerror "If you set up the container in a non-standard" - eerror "location, please set the CONFIGFILE variable." - return 1 - fi -} - -[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)} - -lxc_get_var() { - awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE} -} - -lxc_get_net_link_type() { - awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" } - $1 == "lxc.network.type" {_type=$2;} - $1 == "lxc.network.link" {_link=$2;} - match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;} - match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;} - {if(_link != "" && _type != ""){ - printf("%s:%s\n", _link, _type ); - _link=""; _type=""; - }; }' <${CONFIGFILE} -} - -checkconfig() { - if [ ${CONTAINER} = ${SVCNAME} ]; then - eerror "You have to create an init script for each container:" - eerror " ln -s lxc /etc/init.d/lxc.container" - return 1 - fi - - # no need to output anything, the function takes care of that. - [ -z "${CONFIGFILE}" ] && return 1 - - utsname=$(lxc_get_var lxc.uts.name) - if [ -z "$utsname" ] ; then - utsname=$(lxc_get_var lxc.utsname) - fi - - if [ "${CONTAINER}" != "${utsname}" ]; then - eerror "You should use the same name for the service and the" - eerror "container. Right now the container is called ${utsname}" - return 1 - fi -} - -depend() { - # be quiet, since we have to run depend() also for the - # non-muxed init script, unfortunately. - checkconfig 2>/dev/null || return 0 - - config ${CONFIGFILE} - need localmount - use lxcfs - - local _x _if - for _x in $(lxc_get_net_link_type); do - _if=${_x%:*} - case "${_x##*:}" in - # when the network type is set to phys, we can make use of a - # network service (for instance to set it up before we disable - # the net_admin capability), but we might also not set it up - # at all on the host and leave the net_admin capable service - # to take care of it. - phys) use net.${_if} ;; - *) need net.${_if} ;; - esac - done -} - -start() { - checkconfig || return 1 - rm -f /var/log/lxc/${CONTAINER}.log - - rootpath=$(lxc_get_var lxc.rootfs) - - # Check the format of our init and the chroot's init, to see - # if we have to use linux32 or linux64; always use setarch - # when required, as that makes it easier to deal with - # x32-based containers. - case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in - EM_X86_64) setarch=linux64;; - EM_386) setarch=linux32;; - esac - - ebegin "Starting ${CONTAINER}" - env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log - sleep 1 - - # lxc-start -d will _always_ report a correct startup, even if it - # failed, so rather than trust that, check that the cgroup exists. - [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ] - eend $? -} - -stop() { - checkconfig || return 1 - - - if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then - ewarn "${CONTAINER} doesn't seem to be started." - return 0 - fi - - # 10s should be enough to shut everything down - ebegin "Stopping ${CONTAINER}" - lxc-stop -t 10 -n ${CONTAINER} - eend $? -} diff --git a/app-emulation/lxc/files/lxc_at.service b/app-emulation/lxc/files/lxc_at.service deleted file mode 100644 index 1ef449775306..000000000000 --- a/app-emulation/lxc/files/lxc_at.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Linux Container %I -After=network.target - -[Service] -Restart=always -ExecStart=/usr/sbin/lxc-start -n %i -ExecReload=/usr/sbin/lxc-restart -n %i -ExecStop=/usr/sbin/lxc-stop -n %i - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/lxc/files/lxc_at.service.4 b/app-emulation/lxc/files/lxc_at.service.4 deleted file mode 100644 index 64ae7457096c..000000000000 --- a/app-emulation/lxc/files/lxc_at.service.4 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Linux Container %I -After=network.target -Wants=lxcfs.service - -[Service] -Restart=always -ExecStart=/usr/bin/lxc-start -n %i -F -ExecReload=/usr/bin/lxc-restart -n %i -ExecStop=/usr/bin/lxc-stop -n %i -Delegate=yes - -[Install] -WantedBy=multi-user.target |