[gentoo-commits] proj/betagarden:master commit in: app-emulation/lxc/files/, app-emulation/lxc/
commit: e38f5eda660d26f01dfbfdedf645f3af05a7aeab
Author: Sebastian Pipping gentoo org>
AuthorDate: Fri Mar 27 00:30:28 2020 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Fri Mar 27 01:09:13 2020 +
URL:https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=e38f5eda
app-emulation/lxc: Remove due to dead PYTHON_COMPAT
Signed-off-by: Sebastian Pipping gentoo.org>
app-emulation/lxc/ChangeLog| 17 --
.../lxc/files/lxc--bash-completion.patch | 39 -
app-emulation/lxc/files/lxc.initd.3| 136 ---
app-emulation/lxc/files/lxc_at.service | 12 --
app-emulation/lxc/lxc-.ebuild | 183 -
app-emulation/lxc/metadata.xml | 13 --
6 files changed, 400 deletions(-)
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
deleted file mode 100644
index e843b97..000
--- a/app-emulation/lxc/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for app-emulation/lxc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-
- 18 Nov 2014; Justin Lecher lxc-.ebuild,
- +files/lxc--bash-completion.patch, -files/lxc.initd.2,
- +files/lxc.initd.3, metadata.xml:
- Import tree changes
-
- 08 Jun 2014; Justin Lecher lxc-.ebuild,
- +files/lxc.initd.2, +files/lxc_at.service, metadata.xml:
- Drop installation of non existing TODO file; import tree changes
-
-*lxc- (25 Dec 2013)
-
- 25 Dec 2013; Justin Lecher +lxc-.ebuild, +metadata.xml:
- Live ebuild
-
diff --git a/app-emulation/lxc/files/lxc--bash-completion.patch
b/app-emulation/lxc/files/lxc--bash-completion.patch
deleted file mode 100644
index 942c12f..000
--- a/app-emulation/lxc/files/lxc--bash-completion.patch
+++ /dev/null
@@ -1,39 +0,0 @@
- config/bash/Makefile.am | 8
- config/bash/lxc.in | 2 --
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am
-index b1768c9..3fbbe8e 100644
a/config/bash/Makefile.am
-+++ b/config/bash/Makefile.am
-@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
-
- if ENABLE_BASH
- install-bash:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
-- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
-+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
-+ $(INSTALL_DATA) lxc
$(DESTDIR)$(datarootdir)/bash-completion/completions/
-
- uninstall-bash:
-- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
-- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
-+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
-+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/ || :
-
- install-data-local: install-bash
- uninstall-local: uninstall-bash
-diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 18fd48f..8fff725 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-clone
- complete -o default -F _lxc-generic-o lxc-start-ephemeral
--}
diff --git a/app-emulation/lxc/files/lxc.initd.3
b/app-emulation/lxc/files/lxc.initd.3
deleted file mode 100644
index 463710b..000
--- a/app-emulation/lxc/files/lxc.initd.3
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-lxc_get_configfile() {
- if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
- echo "/etc/lxc/${CONTAINER}.conf"
- elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then
- echo "/etc/lxc/${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;}
- {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
[gentoo-commits] proj/betagarden:master commit in: app-emulation/lxc/files/, app-emulation/lxc/
commit: c23bc69c9cb9a3d2aacf0462f78b90676ba1e743
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Sun Jun 8 08:45:43 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sun Jun 8 08:45:43 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=c23bc69c
app-emulation/lxc: Drop installation of non existing TODO file; import tree
changes
Package-Manager: portage-2.2.10
---
app-emulation/lxc/ChangeLog| 6 +-
app-emulation/lxc/files/lxc.initd.2| 132 +
app-emulation/lxc/files/lxc_at.service | 12 +++
app-emulation/lxc/lxc-.ebuild | 109 +--
app-emulation/lxc/metadata.xml | 10 +++
5 files changed, 229 insertions(+), 40 deletions(-)
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 73ba9fd..e6e8494 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-emulation/lxc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Jun 2014; Justin Lecher j...@gentoo.org lxc-.ebuild,
+ +files/lxc.initd.2, +files/lxc_at.service, metadata.xml:
+ Drop installation of non existing TODO file; import tree changes
+
*lxc- (25 Dec 2013)
25 Dec 2013; Justin Lecher j...@gentoo.org +lxc-.ebuild, +metadata.xml:
diff --git a/app-emulation/lxc/files/lxc.initd.2
b/app-emulation/lxc/files/lxc.initd.2
new file mode 100644
index 000..554019a
--- /dev/null
+++ b/app-emulation/lxc/files/lxc.initd.2
@@ -0,0 +1,132 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.6
2012/11/14 02:15:10 flameeyes Exp $
+
+CONTAINER=${SVCNAME#*.}
+
+lxc_get_configfile() {
+ if [ -f /etc/lxc/${CONTAINER}.conf ]; then
+ echo /etc/lxc/${CONTAINER}.conf
+ elif [ -f /etc/lxc/${CONTAINER}/config ]; then
+ echo /etc/lxc/${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}
+}
+
+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.utsname)
+ 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
+
+ # find out which network interface the container is linked to,
+ # and then require that to be enabled, so that the
+ # dependencies are correct.
+ netif=$(lxc_get_var lxc.network.link)
+
+ # 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.
+ nettype=$(lxc_get_var lxc.network.type)
+
+ if [ -n ${netif} ]; then
+ case ${nettype} in
+ phys) use net.${netif} ;;
+ *) need net.${netif} ;;
+ esac
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ rm /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} $(type -p lxc-start) -l WARN -n ${CONTAINER} -f
${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
+ sleep 0.5
+
+ # lxc-start -d will
