diff options
Diffstat (limited to 'app-emulation/lxd/files/lxd-4.0.0.initd')
| -rw-r--r-- | app-emulation/lxd/files/lxd-4.0.0.initd | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd index 03ec12e44f56..266e84fcef64 100644 --- a/app-emulation/lxd/files/lxd-4.0.0.initd +++ b/app-emulation/lxd/files/lxd-4.0.0.initd @@ -1,12 +1,9 @@ #!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 DAEMON=/usr/sbin/lxd PIDFILE=/run/lxd.pid -TIMEOUT=10 - -extra_commands="stopall" depend() { need net @@ -32,23 +29,11 @@ start() { stop() { if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then - stopall + "${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 } - -stopall() { - ebegin "Stopping lxd service and containers." - lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1 - if [[ ${?} -ne 0 ]]; then - lxc stop --all --force || eerror "Could not stop all containers." - fi - if "${DAEMON}" shutdown; then - rm -f ${PIDFILE} - eend 0 - fi - eend ${?} -} |