From 95580151e6cfe563d6c0550936c7fd92e24a6acf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Feb 2024 17:37:38 +0000 Subject: gentoo auto-resync : 17:02:2024 - 17:37:38 --- app-containers/Manifest.gz | Bin 8728 -> 8730 bytes app-containers/incus/Manifest | 6 --- 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 ------ 8 files changed, 165 deletions(-) delete mode 100644 app-containers/incus/files/incus-0.1.confd delete mode 100644 app-containers/incus/files/incus-0.1.initd delete mode 100644 app-containers/incus/files/incus-0.1.service delete mode 100644 app-containers/incus/files/incus-0.1.socket delete mode 100644 app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch delete mode 100644 app-containers/incus/files/incus-containers-0.1.service (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 280a434f417e..fbd51f2ab39e 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 8a564fa493bd..b0129d358e3f 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -1,14 +1,8 @@ -AUX incus-0.1.confd 604 BLAKE2B 05239d520a5792971dd79a042d0d8ff06414b5822a774065e8ef37f3b4839c2504867a048f22e50ef550ab53be791ac0897318cd75f3d69df213fac3c132f44f SHA512 1fc6b0a9c717dc2d96eca81a21834f3c42b0dde2a19e389895e21e512a3246372e31017f0e3a58f3a28241f1ffba5506d1db47fb9cda0d8bae576dfcaa846d19 -AUX incus-0.1.initd 1746 BLAKE2B 57cc012f4319717cc43897660c76abdab6a8d2ed4c949848c83760f04937dc2274f15a61d7d794eafaaf16eb9db7a9c3ab3880277de934ff861ec4e8835cd165 SHA512 97ab528676071160cfccdd2c9e1e6a18f9c35fbb11db70f8fcd675e7b1f978a085c084f65801db9dbf8eaffe05fdb8ea006c9a6203d45be89fcbb56bcb145d38 -AUX incus-0.1.service 638 BLAKE2B 1478a9e84c63fc2f118f3c08c1473e5ac56ef4689bc6b4cefaf0cab39ada77876bde41ae1d4cc7610aec718bd7252f8349dc2fbecc0de26754c9fdbc485c7121 SHA512 141f0fca28db8f116f333c3bd9eecc10fc0ed3ebbd807d08a953b19ce957c626eb03f5716a2ca74e7d3a63537551acfb78b3decabbae7e135b0a7ac34f52762d -AUX incus-0.1.socket 207 BLAKE2B d1fb41c9a90e0f06eb34c466a460e2d202250769ef3db381b35502ffc19f3246af68069bc63ae62ddf6a34d6730b57c2b509f77b7fea8c4fcad24259658be0bb SHA512 55bf659ff4a1095ab922b87ccf4ef01cbcccd897f67406fa2021151f2c6c16fe59590908c6a6026a8db194598f20708cdf4d6d3d27d9438e746d5f6e39444de5 -AUX incus-0.3-lxd-5.20-compatibility.patch 939 BLAKE2B be2198f501cfd1dc72784b450dbfd0115266b54a99e54f1714caeb8739eac936ccc493b28ecbafc33db5aaf5a9bfd19e67194f82582fbfa8f13b8ca5dadf0686 SHA512 4983ad94b5b63de9338de44de29cd7c467a4b6f0f9be378a23a4b7fb8f006212a32926c35026aa6f26faeae381b289503a05f043da80c7be4ba2a165d7f145de AUX incus-0.4.confd 702 BLAKE2B d1410842512d42b015626208336302940a169e504e0792d73a96b3756e1b7b4280c137b04b4199b0c2e47503944ee4bcdd2c37ceeab7d4ec9de222dff5692cc6 SHA512 7b494bb07ee1e281abedc22c2c7d374ebf35c14bcab25cae634ae146e5f4368fcc9381c700009420d46db2760472ae3a794741ae36353ce1957d412816f30c3d AUX incus-0.4.initd 1782 BLAKE2B 87dfde36250676bab6438a385acf87544b6e1ab150d057d3878cbdadc310e61893ba7cdc8802bd6fba00579d8c7b720c1d1644c75e9b9a8a69464e8cd6d28e17 SHA512 3661b64904141eb3240c5ac0f06a0513f772b531d9e0a2d6b33e0ca79788df45bed2327c017355379fea96f62f2009f20159e5e9056ce878a226a830cdc6fe8e AUX incus-0.4.service 620 BLAKE2B 8e9bee88c79adbdbcbf90ed9602e8f041277dc059dd294a01d7792e90bc70af4a1a40becc830ef140c66cb712b83f02a0761df37d19582ab34e34afe2ccc22da SHA512 44ede44e2450169704c5d0ebd540c3b646567b909fdf4ccaf3aef6ba1d344ed277f7325306a79117ae556c2d3aee4288c37aba87a58b3da1009f5cb609cd0ea5 AUX incus-0.4.socket 195 BLAKE2B 47fd548c3a3809dccab38303b0f103f59da4d57b9ccc7366574de6da161099a29e9065050ad9e47dc7b36b46af031c58ac45628468808d1f70ec63cc890ddb7a SHA512 f905d405f1031196e53297a6d0d83bde27a9571d9315fad39fb6940e11be4df89e91710f7f13cbeb9592e74eba5614307c95e6fa0642dbcc71e34a9a3ae5ee31 AUX incus-0.5.1-handle-legacy-lxd-agent-loader.patch 1031 BLAKE2B 71d87c3d80c9727d1a64742d07efe7fc45fec38655a9355c848a5ad92f2c3f0abb42616b5612871079d5c1443f985b5ca98cfd044ca3815b591e83a836b99157 SHA512 ba294094ff22fadd67106ff1c851e7a2a0fa3e619eb59f8d9fc1ce12e60afa6bd96c01988b76467a69e1772982db44abed5535c3a333d65c20bcc2730d90c8cb -AUX incus-containers-0.1.service 338 BLAKE2B af0849575d2d7578634228576fcf449f8ab54b6fa3a974baec4f91009dec4a6e76253f3724c532f38fc7484ccc6caffae4badf1591c1b04abb3414f4959d550c SHA512 9a9b072442a63683cb9ed71d706606da682e821f609f1f4daea0562ddcea1cc2d6157b29fd466e0aeab149f31b54ab0fff4cf41831e6b2378c47619b8dfd0b55 AUX incus-startup-0.4.service 297 BLAKE2B a9a13cdf5f966601fc28785072c7e05e6636d1f0583762cc220150ca94e930deb1b40a5d57cd2747ca0be67bd4548460b1ed48a8e67734d23101f86d909c3ba8 SHA512 21044267b73a8d59686d4d0a371cc5e74d4ad4c43331f1886a114e9e41cab4fd796da83469a766e360e75b0f356c3e2c4249c4b2f3ae36c3a2fccf539508bbb8 AUX incus-startup-0.4.sh 304 BLAKE2B a30c8a848ed2a3c8ff6eb2552bc59916eb01b178edf0f2036b54e8a02e41b7a534c4d5333b102344fec4804e50bde22dc916a575bd2b44333d90f15633be4fb6 SHA512 60706d6dc3bbf09337a557c0c4335e1b5147cc2a8b2fa15becac887fc36a27724ef385c94e0516b9050400e11d2d3db4e2a382b72ffd65b11475cc57ab4c9f4f AUX incus-user-0.4.initd 670 BLAKE2B 5481019916f573a71ee5dadd5a2fefac137951a9b7bb54da7b55376c4ab4b64f2c709904467cf7d14ebc7b297c9113b01064966388f082a52ea91b90c334c2d4 SHA512 048d4634b25c8000ea6c0bf856050016e04b29080c8a68a9924b58781a3093c3adf0f4ed88841bf297df659f370162d4d7296d2d15256f67ca6f6d5fa5af92ab 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?= -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 ---- - 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 -- cgit v1.2.3