diff options
| author |   Joonas Niilola <juippis@gentoo.org> | 2020-07-13 09:56:21 +0300 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2020-07-13 10:16:00 +0300 |
| commit | ebe0bdd0661553ba0b8657de0d51db56c1241f67 (patch) | |
| tree | 3289d7efb4a28a8d27dae314854dac29607a58f3 /app-emulation/lxd/files | |
| parent | sys-fs/lxcfs: systemd related fixes, #732364 (diff) | |
| download | gentoo-ebe0bdd0661553ba0b8657de0d51db56c1241f67.tar.gz gentoo-ebe0bdd0661553ba0b8657de0d51db56c1241f67.tar.bz2 gentoo-ebe0bdd0661553ba0b8657de0d51db56c1241f67.zip | |
app-emulation/lxd: systemd related fixes #729930
- systemd service files provided by upstream,
- update kernel check CONFIG_NF_NAT_MASQUERADE_IPV4 to NF_NAT_MASQUERADE.
Closes: https://bugs.gentoo.org/729930
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-emulation/lxd/files')
| -rw-r--r-- | app-emulation/lxd/files/lxd-4.0.0.service | 20 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-4.0.0.socket | 12 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-4.0.0_apparmor.service | 21 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-containers-4.0.0.service | 16 |
4 files changed, 69 insertions, 0 deletions
diff --git a/app-emulation/lxd/files/lxd-4.0.0.service b/app-emulation/lxd/files/lxd-4.0.0.service new file mode 100644 index 000000000000..c2e9db8aa8ae --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0.service @@ -0,0 +1,20 @@ +[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.socket b/app-emulation/lxd/files/lxd-4.0.0.socket new file mode 100644 index 000000000000..3207c9453d11 --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0.socket @@ -0,0 +1,12 @@ +[Unit] +Description=LXD - unix socket +Documentation=man:lxd(1) + +[Socket] +ListenStream=/var/lib/lxd/unix.socket +SocketGroup=lxd +SocketMode=0660 +Service=lxd.service + +[Install] +WantedBy=sockets.target diff --git a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service new file mode 100644 index 000000000000..5e688d9c098c --- /dev/null +++ b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service @@ -0,0 +1,21 @@ +[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 diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service b/app-emulation/lxd/files/lxd-containers-4.0.0.service new file mode 100644 index 000000000000..894760c3506b --- /dev/null +++ b/app-emulation/lxd/files/lxd-containers-4.0.0.service @@ -0,0 +1,16 @@ +[Unit] +Description=LXD - container startup/shutdown +Documentation=man:lxd(1) +After=lxd.socket lxd.service +Requires=lxd.socket + +[Service] +Type=oneshot +ExecStart=/usr/sbin/lxd activateifneeded +ExecStop=/usr/sbin/lxd shutdown +TimeoutStartSec=600s +TimeoutStopSec=600s +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target |