* [gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/
@ 2024-02-17 14:35 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2024-02-17 14:35 UTC (permalink / raw
To: gentoo-commits
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?= <stgraber@stgraber.org>
-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 <stgraber@stgraber.org>
----
- 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/
@ 2024-10-27 7:10 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-10-27 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 0d034b7f59b8472e9fbb1454b96140673130f838
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 26 14:04:24 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 07:10:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d034b7f
app-containers/incus: remove unused files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-containers/incus/files/incus-0.4.confd | 26 -------------
app-containers/incus/files/incus-0.4.initd | 59 ------------------------------
2 files changed, 85 deletions(-)
diff --git a/app-containers/incus/files/incus-0.4.confd b/app-containers/incus/files/incus-0.4.confd
deleted file mode 100644
index b0f7e0e212ae..000000000000
--- a/app-containers/incus/files/incus-0.4.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Group which owns the shared socket
-INCUS_OPTIONS+=" --group incus-admin"
-
-# 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"
-
-# Increase ulimits to allow more open files on OpenRC.
-rc_ulimit="-n 1048576 -l unlimited"
diff --git a/app-containers/incus/files/incus-0.4.initd b/app-containers/incus/files/incus-0.4.initd
deleted file mode 100644
index 34e1f07a8921..000000000000
--- a/app-containers/incus/files/incus-0.4.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/incus.pid
-
-depend() {
- need net
- need lxcfs
-}
-
-start() {
- ebegin "Starting incus daemon 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-admin --owner root --mode 0775
- install -d /var/log/incus --group incus-admin --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-admin --owner root
- mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
- fi
-}
-
-stop() {
- if [ "${RC_CMD}" = restart ]; then
- ebegin "Stopping incus daemon 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 incus daemon 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/
@ 2025-04-28 3:35 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2025-04-28 3:35 UTC (permalink / raw
To: gentoo-commits
commit: 5f62fc3fce6c2a7a3252f03a7fe50cbd5cb1a25f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Apr 27 19:23:48 2025 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 28 03:34:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f62fc3f
app-containers/incus: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...cus-6.9-ensure-leading-slash-in-all-paths.patch | 32 ------------------
.../files/incus-6.9-read-files-in-chunks.patch | 39 ----------------------
2 files changed, 71 deletions(-)
diff --git a/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch b/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch
deleted file mode 100644
index a4647528c593..000000000000
--- a/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b726905c66050ac4229d53ce079a0bd05dbe900d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
-Date: Thu, 30 Jan 2025 15:21:36 +0100
-Subject: [PATCH] incus/file/pull: Ensure we have a leading / in all paths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes #1614
-
-Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
----
- cmd/incus/file.go | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cmd/incus/file.go b/cmd/incus/file.go
-index a17486ad327..99467a0bfc5 100644
---- a/cmd/incus/file.go
-+++ b/cmd/incus/file.go
-@@ -575,6 +575,11 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error {
- return fmt.Errorf(i18n.G("Invalid source %s"), resource.name)
- }
-
-+ // Make sure we have a leading / for the path.
-+ if !strings.HasPrefix(pathSpec[1], "/") {
-+ pathSpec[1] = "/" + pathSpec[1]
-+ }
-+
- sftpConn, ok := sftpClients[pathSpec[0]]
- if !ok {
- sftpConn, err = resource.server.GetInstanceFileSFTP(pathSpec[0])
-
diff --git a/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch b/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch
deleted file mode 100644
index 05c7b45c0e5d..000000000000
--- a/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f2ef7aa808e204c8714de40b29895ea596e2bb0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
-Date: Sun, 2 Feb 2025 09:18:54 +0100
-Subject: [PATCH] incus/file/pull: Read files in chunks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
----
- cmd/incus/file.go | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/cmd/incus/file.go b/cmd/incus/file.go
-index 99467a0bfc5..4aad930acd8 100644
---- a/cmd/incus/file.go
-+++ b/cmd/incus/file.go
-@@ -686,10 +686,17 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error {
- return err
- }
- } else {
-- _, err = io.Copy(writer, src)
-- if err != nil {
-- progress.Done("")
-- return err
-+ for {
-+ // Read 1MB at a time.
-+ _, err = io.CopyN(writer, src, 1024*1024*1024)
-+ if err != nil {
-+ if err == io.EOF {
-+ break
-+ }
-+
-+ progress.Done("")
-+ return err
-+ }
- }
- }
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-28 3:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-27 7:10 [gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2025-04-28 3:35 Joonas Niilola
2024-02-17 14:35 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox