From 4b73048ace3f3df767ead4517cfe5a73352cb142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 23 Nov 2021 14:00:17 +0100 Subject: app-emulation/lxd: try to update lxd --- app-emulation/lxd/files/lxd-4.0.0.confd | 23 +++++ app-emulation/lxd/files/lxd-4.0.0.initd | 47 +++++++++ app-emulation/lxd/files/lxd-4.0.0.socket | 12 +++ app-emulation/lxd/files/lxd-4.0.7-no-werror.patch | 108 +++++++++++++++++++++ app-emulation/lxd/files/lxd-4.0.7-r1.service | 20 ++++ .../lxd/files/lxd-containers-4.0.0.service | 16 +++ 6 files changed, 226 insertions(+) create mode 100644 app-emulation/lxd/files/lxd-4.0.0.confd create mode 100644 app-emulation/lxd/files/lxd-4.0.0.initd create mode 100644 app-emulation/lxd/files/lxd-4.0.0.socket create mode 100644 app-emulation/lxd/files/lxd-4.0.7-no-werror.patch create mode 100644 app-emulation/lxd/files/lxd-4.0.7-r1.service create mode 100644 app-emulation/lxd/files/lxd-containers-4.0.0.service (limited to 'app-emulation/lxd/files') diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd new file mode 100644 index 0000000..68cf344 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0.confd @@ -0,0 +1,23 @@ +# Group which owns the shared socket +LXD_OPTIONS+=" --group lxd" + +# Enable cpu profiling into the specified file +#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" + +# Enable memory profiling into the specified file +#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" + +# Enable debug mode +#LXD_OPTIONS+=" --debug" + +# For debugging, print a complete stack trace every n seconds +#LXD_OPTIONS+=" --print-goroutines-every 5" + +# Enable verbose mode +#LXD_OPTIONS+=" -v" + +# Logfile to log to +#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" + +# Enable syslog logging +#LXD_OPTIONS+=" --syslog" diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd new file mode 100644 index 0000000..e6ae971 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0.initd @@ -0,0 +1,47 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DAEMON=/usr/sbin/lxd +PIDFILE=/run/lxd.pid + +depend() { + need net + need lxcfs +} + +start() { + ebegin "Starting lxd service" + + modprobe -f loop > /dev/null 2>&1 + + # fix permissions on /var/lib/lxd and make sure it exists + install -d /var/lib/lxd --group lxd --owner root --mode 0775 + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${DAEMON} \ + --background \ + --make-pidfile \ + -- \ + ${LXD_OPTIONS} + eend ${?} +} + +stop() { + if [ "${RC_CMD}" = restart ]; then + ebegin "Stopping lxd service (but not containers)" + # start-stop-daemon sends SIGTERM with a timeout of 5s by default. + # SIGTERM indicates to LXD that it will be stopped temporarily. + # Instances will keep running. + start-stop-daemon --stop --quiet -p "${PIDFILE}" + eend ${?} + else + ebegin "Stopping lxd service and containers, waiting 40s" + # SIGPWR indicates to LXD that the host is going down. + # LXD will do a clean shutdown of all instances. + # After 30s all remaining instances will be killed. + # We wait up to 40s for LXD. + start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}" + eend ${?} + fi +} diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket b/app-emulation/lxd/files/lxd-4.0.0.socket new file mode 100644 index 0000000..3207c94 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0.socket @@ -0,0 +1,12 @@ +[Unit] +Description=LXD - unix socket +Documentation=man:lxd(1) + +[Socket] +ListenStream=/var/lib/lxd/unix.socket +SocketGroup=lxd +SocketMode=0660 +Service=lxd.service + +[Install] +WantedBy=sockets.target diff --git a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch new file mode 100644 index 0000000..50a9163 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch @@ -0,0 +1,108 @@ +diff -Naur lxd-4.0.7/lxd/cgo.go lxd-4.0.7-no-werror/lxd/cgo.go +--- lxd-4.0.7/lxd/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/cgo.go 2021-11-16 15:16:23.575299112 +0200 +@@ -3,7 +3,7 @@ + + package main + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/seccomp/cgo.go lxd-4.0.7-no-werror/lxd/seccomp/cgo.go +--- lxd-4.0.7/lxd/seccomp/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/seccomp/cgo.go 2021-11-16 15:16:34.928629720 +0200 +@@ -3,7 +3,7 @@ + + package seccomp + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/storage/cgo.go lxd-4.0.7-no-werror/lxd/storage/cgo.go +--- lxd-4.0.7/lxd/storage/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/storage/cgo.go 2021-11-16 15:16:44.585294068 +0200 +@@ -3,7 +3,7 @@ + + package storage + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/storage/quota/cgo.go lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go +--- lxd-4.0.7/lxd/storage/quota/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go 2021-11-16 15:16:54.231958418 +0200 +@@ -3,7 +3,7 @@ + + package quota + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd-p2c/cgo.go lxd-4.0.7-no-werror/lxd-p2c/cgo.go +--- lxd-4.0.7/lxd-p2c/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd-p2c/cgo.go 2021-11-16 15:17:06.185288881 +0200 +@@ -2,7 +2,7 @@ + + package main + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/cgo.go lxd-4.0.7-no-werror/shared/cgo.go +--- lxd-4.0.7/shared/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/cgo.go 2021-11-16 15:17:15.238620041 +0200 +@@ -3,7 +3,7 @@ + + package shared + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/idmap/cgo.go lxd-4.0.7-no-werror/shared/idmap/cgo.go +--- lxd-4.0.7/shared/idmap/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/idmap/cgo.go 2021-11-16 15:17:25.768617513 +0200 +@@ -3,7 +3,7 @@ + + package idmap + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/netutils/cgo.go lxd-4.0.7-no-werror/shared/netutils/cgo.go +--- lxd-4.0.7/shared/netutils/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/netutils/cgo.go 2021-11-16 15:17:34.598615393 +0200 +@@ -3,7 +3,7 @@ + + package netutils + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/termios/cgo.go lxd-4.0.7-no-werror/shared/termios/cgo.go +--- lxd-4.0.7/shared/termios/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/termios/cgo.go 2021-11-16 15:17:43.568613239 +0200 +@@ -3,7 +3,7 @@ + + package termios + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration diff --git a/app-emulation/lxd/files/lxd-4.0.7-r1.service b/app-emulation/lxd/files/lxd-4.0.7-r1.service new file mode 100644 index 0000000..f1e644b --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.7-r1.service @@ -0,0 +1,20 @@ +[Unit] +Description=LXD - main daemon +After=network-online.target lxcfs.service lxd.socket +Requires=network-online.target lxcfs.service lxd.socket +Documentation=man:lxd(1) + +[Service] +EnvironmentFile=-/etc/environment +ExecStart=/usr/sbin/lxd --group lxd --syslog +ExecStartPost=/usr/sbin/lxd waitready --timeout=600 +KillMode=process +TimeoutStartSec=600s +TimeoutStopSec=30s +Restart=on-failure +LimitNOFILE=1048576 +LimitNPROC=infinity +TasksMax=infinity + +[Install] +Also=lxd-containers.service lxd.socket diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service b/app-emulation/lxd/files/lxd-containers-4.0.0.service new file mode 100644 index 0000000..894760c --- /dev/null +++ b/app-emulation/lxd/files/lxd-containers-4.0.0.service @@ -0,0 +1,16 @@ +[Unit] +Description=LXD - container startup/shutdown +Documentation=man:lxd(1) +After=lxd.socket lxd.service +Requires=lxd.socket + +[Service] +Type=oneshot +ExecStart=/usr/sbin/lxd activateifneeded +ExecStop=/usr/sbin/lxd shutdown +TimeoutStartSec=600s +TimeoutStopSec=600s +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3