diff options
author | Joonas Niilola <juippis@gentoo.org> | 2022-07-18 09:50:43 +0300 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2022-07-18 10:01:04 +0300 |
commit | 0d0aea3ac1915b42f6769703891e6fe50e840a50 (patch) | |
tree | 9eca1b1578113677fdb598c52d0e2a76f8f647e2 /app-containers/lxc/files | |
parent | dev-tcltk/snack: fix type mismatch (diff) | |
download | gentoo-0d0aea3ac1915b42f6769703891e6fe50e840a50.tar.gz gentoo-0d0aea3ac1915b42f6769703891e6fe50e840a50.tar.bz2 gentoo-0d0aea3ac1915b42f6769703891e6fe50e840a50.zip |
app-containers/lxc: add 5.0.0
- build system switched to meson, so dropping all keywords off,
- some changes to handling systemd in general - there's a chance gentoo-lxc
on systemd breaks due to this (did my best to test it but...)
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-containers/lxc/files')
-rw-r--r-- | app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch | 27 | ||||
-rw-r--r-- | app-containers/lxc/files/lxc-monitord.service.5.0.0 | 11 | ||||
-rw-r--r-- | app-containers/lxc/files/lxc-net.service.5.0.0 | 15 | ||||
-rw-r--r-- | app-containers/lxc/files/lxc.service-5.0.0 | 19 | ||||
-rw-r--r-- | app-containers/lxc/files/lxc_at.service.5.0.0 | 19 |
5 files changed, 91 insertions, 0 deletions
diff --git a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch new file mode 100644 index 000000000000..74f3d353c561 --- /dev/null +++ b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch @@ -0,0 +1,27 @@ +From 7d72354898feac15bc4082130bcbe638bae02450 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Thu, 14 Jul 2022 17:03:40 +0200 +Subject: [PATCH] meson.build: fix build with -Dcapabilities=false + +Define libcap_static to an empty array to avoid the following build +failure with -Dcapabilities=false: + +output/build/lxc-5.0.0/src/lxc/cmd/meson.build:64:4: ERROR: Unknown variable "libcap_static". + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 992fa08c72..4ed57a655b 100644 +--- a/meson.build ++++ b/meson.build +@@ -443,6 +443,7 @@ int main(int argc, char *argv[]) { return 0; }; + srcconf.set10('HAVE_STATIC_LIBCAP', false) + endif + else ++ libcap_static = [] + srcconf.set10('HAVE_LIBCAP', false) + srcconf.set10('HAVE_STATIC_LIBCAP', false) + endif diff --git a/app-containers/lxc/files/lxc-monitord.service.5.0.0 b/app-containers/lxc/files/lxc-monitord.service.5.0.0 new file mode 100644 index 000000000000..ff4a201152c0 --- /dev/null +++ b/app-containers/lxc/files/lxc-monitord.service.5.0.0 @@ -0,0 +1,11 @@ +[Unit] +Description=LXC Container Monitoring Daemon +After=syslog.service network.target +Documentation=man:lxc + +[Service] +Type=simple +ExecStart=/usr/libexec/lxc/lxc-monitord --daemon + +[Install] +WantedBy=multi-user.target diff --git a/app-containers/lxc/files/lxc-net.service.5.0.0 b/app-containers/lxc/files/lxc-net.service.5.0.0 new file mode 100644 index 000000000000..8a037fcb7614 --- /dev/null +++ b/app-containers/lxc/files/lxc-net.service.5.0.0 @@ -0,0 +1,15 @@ +[Unit] +Description=LXC network bridge setup +After=network-online.target +Before=lxc.service +Documentation=man:lxc +ConditionVirtualization=!lxc + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/libexec/lxc/lxc-net start +ExecStop=/usr/libexec/lxc/lxc-net stop + +[Install] +WantedBy=multi-user.target diff --git a/app-containers/lxc/files/lxc.service-5.0.0 b/app-containers/lxc/files/lxc.service-5.0.0 new file mode 100644 index 000000000000..35d0dff241d0 --- /dev/null +++ b/app-containers/lxc/files/lxc.service-5.0.0 @@ -0,0 +1,19 @@ +[Unit] +Description=LXC Container Initialization and Autoboot Code +After=network.target lxc-net.service remote-fs.target +Wants=lxc-net.service +Documentation=man:lxc-autostart man:lxc + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load +ExecStart=/usr/libexec//lxc/lxc-containers start +ExecStop=/usr/libexec/lxc/lxc-containers stop +ExecReload=/usr/libexec/lxc/lxc-apparmor-load +# Environment=BOOTUP=serial +# Environment=CONSOLETYPE=serial +Delegate=yes + +[Install] +WantedBy=multi-user.target diff --git a/app-containers/lxc/files/lxc_at.service.5.0.0 b/app-containers/lxc/files/lxc_at.service.5.0.0 new file mode 100644 index 000000000000..447b6c87ec5d --- /dev/null +++ b/app-containers/lxc/files/lxc_at.service.5.0.0 @@ -0,0 +1,19 @@ +[Unit] +Description=LXC Container: %i +# This pulls in apparmor, dev-setup, lxc-net +After=lxc.service +Wants=lxc.service +Documentation=man:lxc-start man:lxc + +[Service] +Type=simple +KillMode=mixed +TimeoutStopSec=120s +ExecStart=/usr/bin/lxc-start -F -n %i +ExecStop=/usr/bin/lxc-stop -n %i +# Environment=BOOTUP=serial +# Environment=CONSOLETYPE=serial +Delegate=yes + +[Install] +WantedBy=multi-user.target |