commit: d480c37f323467c92bb7b99d39f2ed874256e566
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:11 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d480c37f
app-containers/incus: remove unused patches/files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-containers/incus/files/incus-0.1.confd | 23 ---------
app-containers/incus/files/incus-0.1.initd | 59 ----------------------
app-containers/incus/files/incus-0.1.service | 23 ---------
app-containers/incus/files/incus-0.1.socket | 12 -----
.../files/incus-0.3-lxd-5.20-compatibility.patch | 26 ----------
.../incus/files/incus-containers-0.1.service | 16 ------
6 files changed, 159 deletions(-)
diff --git a/app-containers/incus/files/incus-0.1.confd
b/app-containers/incus/files/incus-0.1.confd
deleted file mode 100644
index ec857143c2da..000000000000
--- a/app-containers/incus/files/incus-0.1.confd
+++ /dev/null
@@ -1,23 +0,0 @@
-# Group which owns the shared socket
-INCUS_OPTIONS+=" --group incus"
-
-# Enable cpu profiling into the specified file
-#INCUS_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#INCUS_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-# Enable debug mode
-#INCUS_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#INCUS_OPTIONS+=" --print-goroutines-every 5"
-
-# Enable verbose mode
-#INCUS_OPTIONS+=" -v"
-
-# Logfile to log to
-#INCUS_OPTIONS+=" --logfile /var/log/incus/incus.log"
-
-# Enable syslog logging
-#INCUS_OPTIONS+=" --syslog"
diff --git a/app-containers/incus/files/incus-0.1.initd
b/app-containers/incus/files/incus-0.1.initd
deleted file mode 100644
index d09ffe224d04..000000000000
--- a/app-containers/incus/files/incus-0.1.initd
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/incusd
-PIDFILE=/run/incusd.pid
-
-depend() {
- need net
- need lxcfs
-}
-
-start() {
- ebegin "Starting incus service"
-
- modprobe -f loop > /dev/null 2>&1
-
- # Fix permissions on /var/lib/incus and make sure it exists.
- # Create a log directory for incus with correct permissions.
- install -d /var/lib/incus --group incus --owner root --mode 0775
- install -d /var/log/incus --group incus --owner root
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${INCUS_OPTIONS}
- eend ${?}
-
- # Create necessary systemd paths in order for systemd containers to
work on openrc host.
- # /etc/rc.conf should have following values:
- # rc_cgroup_mode="hybrid"
- if [ -d /sys/fs/cgroup/unified ] &&
- [ ! -d /sys/fs/cgroup/systemd ]; then
- install -d /sys/fs/cgroup/systemd --group incus --owner root
- mount -t cgroup -o none,name=systemd systemd
/sys/fs/cgroup/systemd
- fi
-}
-
-stop() {
- if [ "${RC_CMD}" = restart ]; then
- ebegin "Stopping incusd service (but not containers)"
- # start-stop-daemon sends SIGTERM with a timeout of 5s by
default.
- # SIGTERM indicates to INCUS that it will be stopped
temporarily.
- # Instances will keep running.
- start-stop-daemon --stop --quiet -p "${PIDFILE}"
- eend ${?}
- else
- ebegin "Stopping incusd service and containers, waiting 40s"
- # SIGPWR indicates to INCUS 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 INCUS.
- start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
- eend ${?}
- fi
-}
diff --git a/app-containers/incus/files/incus-0.1.service
b/app-containers/incus/files/incus-0.1.service
deleted file mode 100644
index 354a53122923..000000000000
--- a/app-containers/incus/files/incus-0.1.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Incus - main daemon
-After=network-online.target lxcfs.service incus.socket
-Requires=network-online.target lxcfs.service incus.socket
-Documentation=man:incus(1)
-
-[Service]
-EnvironmentFile=-/etc/environment
-ExecStart=/usr/sbin/incusd --group incus --syslog
-ExecStartPost=/usr/sbin/incusd waitready --timeout=600
-ExecStartPre=/bin/mkdir -p /var/log/incus
-ExecStartPre=/bin/chown -R root:incus /var/log/incus
-KillMode=process
-PermissionsStartOnly=true
-TimeoutStartSec=600s
-TimeoutStopSec=30s
-Restart=on-failure
-LimitNOFILE=1048576
-LimitNPROC=infinity
-TasksMax=infinity
-
-[Install]
-Also=incus-containers.service incus.socket
diff --git a/app-containers/incus/files/incus-0.1.socket
b/app-containers/incus/files/incus-0.1.socket
deleted file mode 100644
index 864ebf19954e..000000000000
--- a/app-containers/incus/files/incus-0.1.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=incus - unix socket
-Documentation=man:incus(1)
-
-[Socket]
-ListenStream=/var/lib/incus/unix.socket
-SocketGroup=incus
-SocketMode=0660
-Service=incus.service
-
-[Install]
-WantedBy=sockets.target
diff --git a/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch
b/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch
deleted file mode 100644
index a20b40105119..000000000000
--- a/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8bd2b3b3f889787de515eaea532ff728527a8788 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]>
-Date: Tue, 12 Dec 2023 23:12:41 -0500
-Subject: [PATCH] lxd-to-incus: Update for LXD 5.20
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stéphane Graber <[email protected]>
----
- cmd/lxd-to-incus/validate.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/lxd-to-incus/validate.go b/cmd/lxd-to-incus/validate.go
-index 8e8020ebf..0078f8793 100644
---- a/cmd/lxd-to-incus/validate.go
-+++ b/cmd/lxd-to-incus/validate.go
-@@ -13,7 +13,7 @@ import (
- )
-
- var minLXDVersion = &version.DottedVersion{4, 0, 0}
--var maxLXDVersion = &version.DottedVersion{5, 19, 0}
-+var maxLXDVersion = &version.DottedVersion{5, 20, 0}
-
- func (c *cmdMigrate) validate(source Source, target Target) error {
- srcClient, err := source.Connect()
diff --git a/app-containers/incus/files/incus-containers-0.1.service
b/app-containers/incus/files/incus-containers-0.1.service
deleted file mode 100644
index 038d633a53d7..000000000000
--- a/app-containers/incus/files/incus-containers-0.1.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=incus - container startup/shutdown
-Documentation=man:incus(1)
-After=incus.socket incus.service
-Requires=incus.socket
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/incusd activateifneeded
-ExecStop=/usr/sbin/incusd shutdown
-TimeoutStartSec=600s
-TimeoutStopSec=600s
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
