improvements taken from official lxd package

6 files changed, 31 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0243eef8343..99a658d290af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lxd-git
 	pkgdesc = Daemon based on liblxc offering a REST API to manage containers
-	pkgver = 4.16.r370.0331ea1ff
+	pkgver = 5.4.r293.ce5d10282
 	pkgrel = 1
 	url = https://linuxcontainers.org/lxd
 	arch = x86_64
@@ -19,7 +19,7 @@ pkgbase = lxd-git
 	optdepends = btrfs-progs: for btrfs storage driver support
 	optdepends = ceph: for ceph storage driver support
 	optdepends = jq: needed by empty-lxd.sh script
-	optdepends = qemu: needed for virtual machine support
+	optdepends = qemu-base: needed for virtual machine support
 	optdepends = edk2-ovmf: needed for virtual machine support
 	optdepends = mkisolinux: needed for virtual machine support
 	provides = lxd
@@ -30,9 +30,11 @@ pkgbase = lxd-git
 	source = git+https://github.com/lxc/lxd.git
 	source = lxd.service
 	source = lxd.socket
+	source = lxd.sysusers
 	md5sums = SKIP
 	md5sums = 5b7032b4b6adc4c4b80d9a919b9cd8a2
 	md5sums = 1fb28d8dfe82af71d0675c8e9a0a7293
+	md5sums = 518ccee2025394ce1094d716668bc83f
 
 pkgname = lxd-git
 	install = lxd.install
diff --git a/PKGBUILD b/PKGBUILD
index c21593274648..64b819c4efe6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=lxd-git
 _pkgname=lxd
-pkgver=4.16.r370.0331ea1ff
+pkgver=5.4.r293.ce5d10282
 pkgrel=1
 pkgdesc="Daemon based on liblxc offering a REST API to manage containers"
 arch=('x86_64')
@@ -20,18 +20,20 @@ optdepends=('lvm2: for lvm2 support'
             'btrfs-progs: for btrfs storage driver support'
             'ceph: for ceph storage driver support'
             'jq: needed by empty-lxd.sh script'
-            'qemu: needed for virtual machine support'
+            'qemu-base: needed for virtual machine support'
             'edk2-ovmf: needed for virtual machine support'
-            'mkisolinux: needed for virtual machine support'
+            'cdrtools: needed for virtual machine support'
 )
 options=('!strip' '!emptydirs')
 source=("git+https://github.com/lxc/lxd.git"
         "lxd.service"
         "lxd.socket"
+        "lxd.sysusers"
 )
 md5sums=('SKIP'
-         '5b7032b4b6adc4c4b80d9a919b9cd8a2'
-         '1fb28d8dfe82af71d0675c8e9a0a7293')
+         '8cb3f1d6188b5b49459d36524587bfc1'
+         '41a58bbbb018f26937ab5167ee3d2d43'
+         '518ccee2025394ce1094d716668bc83f')
 
 _lxd=github.com/lxc/lxd
 
@@ -62,8 +64,6 @@ package() {
   install=lxd.install
   mkdir -p "${pkgdir}/usr/bin"
   mkdir -p "${pkgdir}/usr/lib/lxd"
-  mkdir -p "${pkgdir}/usr/share/doc/lxd"
-  mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
   install -p -m755 "${go_bin_dir}/"* "${pkgdir}/usr/bin"
   patchelf --set-rpath "/usr/lib/lxd" "${pkgdir}/usr/bin/lxd"
   cp --no-dereference --preserve=timestamps \
@@ -82,10 +82,13 @@ package() {
     "${pkgdir}/usr/lib/systemd/system/lxd.socket"
 
   # documentation
-  install -D -m644 "${srcdir}/go/src/${_lxd}/doc/"* \
+  mkdir -p "${pkgdir}/usr/share/doc/lxd"
+  rm -rf "${srcdir}/go/src/${_lxd}/doc/html"
+  cp -vr "${srcdir}/go/src/${_lxd}/doc/"* \
     "${pkgdir}/usr/share/doc/lxd/"
 
   # helper scripts
+  mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
   install -p -m644 "${srcdir}/go/src/${_lxd}/scripts/bash/lxd-client" \
     "${pkgdir}/usr/share/bash-completion/completions/lxd"
   install -p -m755 "${srcdir}/go/src/${_lxd}/scripts/empty-lxd.sh" "${pkgdir}/usr/lib/lxd"
diff --git a/lxd.install b/lxd.install
index 1fa90d38fe1a..de95806f6136 100644
--- a/lxd.install
+++ b/lxd.install
@@ -1,5 +1,4 @@
 post_install() {
-    getent group lxd || groupadd lxd
     echo "LXD allows everyone in the lxd group to talk to LXD."
     echo ""
     echo "LXD needs sub{u,g}ids for root, so that it can create unprivileged containers."
diff --git a/lxd.service b/lxd.service
index 51df6f5a0fe6..d37bc84030b4 100644
--- a/lxd.service
+++ b/lxd.service
@@ -1,16 +1,23 @@
 [Unit]
-Description=Daemon based on liblxc offering a REST API to manage containers.
-After=network.target
+Description=LXD Container Hypervisor
+After=network-online.target lxcfs.service
+Requires=network-online.target lxcfs.service lxd.socket
+Documentation=file:///usr/share/doc/lxd/
 
 [Service]
-Type=simple
 Environment=LXD_OVMF_PATH=/usr/share/ovmf/x64
-ExecStart=/usr/bin/lxd --group lxd
+ExecStart=/usr/bin/lxd --group=lxd --logfile=/var/log/lxd/lxd.log
+ExecStartPost=/usr/bin/lxd waitready --timeout=600
 ExecStop=/usr/bin/lxd shutdown
-KillMode=process
+TimeoutStartSec=600s
+TimeoutStopSec=30s
+Restart=on-failure
 LimitNOFILE=1048576
 LimitNPROC=infinity
+LimitCORE=infinity
 TasksMax=infinity
+Delegate=yes
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target
diff --git a/lxd.socket b/lxd.socket
index b6737f962753..f321fd89dbb1 100644
--- a/lxd.socket
+++ b/lxd.socket
@@ -1,12 +1,13 @@
 [Unit]
 Description=LXD - unix socket
-After=network.target
+Documentation=file:///usr/share/doc/lxd/
 
 [Socket]
 ListenStream=/var/lib/lxd/unix.socket
 SocketMode=0660
-SocketUser=root
 SocketGroup=lxd
+Service=lxd.service
 
 [Install]
 WantedBy=sockets.target
+
diff --git a/lxd.sysusers b/lxd.sysusers
new file mode 100644
index 000000000000..284de07b31b2
--- /dev/null
+++ b/lxd.sysusers
@@ -0,0 +1 @@
+g lxd - -