public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2015-11-16  2:54 Erik Mackdanz
  0 siblings, 0 replies; 8+ messages in thread
From: Erik Mackdanz @ 2015-11-16  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c0ba0d70894bfc5759f3b2cabe189e1698fb004d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 02:54:53 2015 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 02:54:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ba0d70

app-emulation/lxd: fix systemd service unit

Package-Manager: portage-2.2.24

 app-emulation/lxd/files/lxd.service | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/lxd/files/lxd.service b/app-emulation/lxd/files/lxd.service
index 3bf229f..a409051 100644
--- a/app-emulation/lxd/files/lxd.service
+++ b/app-emulation/lxd/files/lxd.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Container hypervisor based on LXC
-After=cgmanager.service lxc.service
-Requires=cgmanager.service lxc.service
+After=cgmanager.service
+Requires=cgmanager.service
 
 [Service]
-ExecStart=/usr/bin/lxd --group lxd
+ExecStart=/usr/sbin/lxd --group lxd
 KillMode=process
 Restart=on-failure
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2017-09-21 12:41 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2017-09-21 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8ced8760c173727ab1f5184f2c5a62954dc29d5f
Author:     Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Mon Sep  4 23:43:17 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 12:41:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ced8760

app-emulation/lxd: normalize initd wording

Gentoo-Bug: 628680

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-emulation/lxd/files/lxd-2.17.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-2.17.initd b/app-emulation/lxd/files/lxd-2.17.initd
index 51c8e7e0655..b1fa7caac54 100644
--- a/app-emulation/lxd/files/lxd-2.17.initd
+++ b/app-emulation/lxd/files/lxd-2.17.initd
@@ -13,7 +13,7 @@ depend() {
 }
 
 start() {
-    ebegin "Starting lxd server"
+    ebegin "Starting lxd service"
 
     start-stop-daemon --start \
 		      --pidfile ${PIDFILE} \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-02-16  8:33 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-02-16  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     1f7a406c30e7c3d28528e70222120ef353f41f5a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 08:33:00 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 08:33:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7a406c

app-emulation/lxd: remove pidfile on shutdown

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 51284f6e2ae..1cd4da1840b 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -31,5 +31,6 @@ start() {
 stop() {
 	ebegin "Stopping lxd service (but not containers)."
 	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	rm -f ${PIDFILE}
 	eend ${?}
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-02-16 12:16 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-02-16 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ae2b0f58b84aa443a09d6fc7e03ba5d52b778436
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 12:16:19 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:16:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2b0f58

app-emulation/lxd: remove unused variable from init.d file

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index baec86805c6..266e84fcef6 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -4,7 +4,6 @@
 
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
-TIMEOUT=10
 
 depend() {
 	need net


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-02-16 12:16 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-02-16 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     43b0f09708ca0ee5fb22bec6f3c5320b26c8b535
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 11:34:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:16:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b0f097

app-emulation/lxd: rework init.d file shutdown logic

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 1cd4da1840b..baec86805c6 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -29,8 +29,12 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping lxd service (but not containers)."
-	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend ${?}
+	if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
+		"${DAEMON}" shutdown
+		rm -f ${PIDFILE}
+	else
+		ebegin "Stopping lxd service (but not containers)."
+		start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+		eend ${?}
+	fi
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-02-18 17:35 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-02-18 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6ea96b2080d0903324e22a39400d23f1c7e1f71c
Author:     Benedikt Neuffer <gentoo <AT> itfriend <DOT> de>
AuthorDate: Wed Feb 17 09:54:29 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 17:35:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea96b20

app-emulation/lxd: use signals in openrc script

Rework on openrc script to use signals to communicate with the LXD daemon.

Bug: https://bugs.gentoo.org/770511
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Benedikt Neuffer <ogelpre <AT> itfriend.de>
Closes: https://bugs.gentoo.org/770511
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 266e84fcef6..c55b2da6a84 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -28,12 +28,20 @@ start() {
 }
 
 stop() {
-	if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
-		"${DAEMON}" shutdown
-		rm -f ${PIDFILE}
+	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 (but not containers)."
-		start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+		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
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-03-07  6:32 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-03-07  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     9c60e52a45eb8cc099cd735c7dfa00516435a7a3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 06:29:27 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 06:32:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c60e52a

app-emulation/lxd: more POSIX-compliant init.d file, #609070

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index c55b2da6a84..e6ae971e879 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -28,7 +28,7 @@ start() {
 }
 
 stop() {
-	if [[ "${RC_CMD}" = restart ]]; then
+	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.


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/
@ 2021-11-15 21:56 Conrad Kostecki
  0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-11-15 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ddd91d013c3a1a2001957b91ded9c9a7fa46d8e6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Nov 13 17:00:33 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 21:55:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd91d01

app-emulation/lxd: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22932
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.service          | 20 --------------------
 app-emulation/lxd/files/lxd-4.0.0_apparmor.service | 21 ---------------------
 2 files changed, 41 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.service b/app-emulation/lxd/files/lxd-4.0.0.service
deleted file mode 100644
index c2e9db8aa8ae..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.0.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[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 --logfile=/var/log/lxd/lxd.log
-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-4.0.0_apparmor.service b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
deleted file mode 100644
index 5e688d9c098c..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[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
-ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load
-ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log
-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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-11-15 21:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-16  8:33 [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2021-11-15 21:56 Conrad Kostecki
2021-03-07  6:32 Joonas Niilola
2021-02-18 17:35 Joonas Niilola
2021-02-16 12:16 Joonas Niilola
2021-02-16 12:16 Joonas Niilola
2017-09-21 12:41 Amy Liffey
2015-11-16  2:54 Erik Mackdanz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox