From 6c45e6504b1040e3e3f8f7be5d96c5a483c11d8940ab72639a92eec357812aa5 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sat, 6 Mar 2021 00:12:59 +0000 Subject: [PATCH] Accepting request 877272 from home:cyphar:lxc - Update to LXD 4.12. The full upstream changelog is available from: https://discuss.linuxcontainers.org/t/lxd-4-12-has-been-released/10424 boo#1183111 + Initial Network ACLs support (OVN-only) + Project restricted certificates + Server configuration options now supported at the project level + Configuration option for Ceph features * Projects now supported by lxd init --dump and --preseed * Initial auto-generated REST-API documentation + VM: Stateful stop and stateful snapshots for virtual machines OBS-URL: https://build.opensuse.org/request/show/877272 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=77 --- lxd-4.11.tar.gz | 3 --- lxd-4.11.tar.gz.asc | 16 ---------------- lxd-4.12.tar.gz | 3 +++ lxd-4.12.tar.gz.asc | 16 ++++++++++++++++ lxd.changes | 16 ++++++++++++++++ lxd.service | 1 + lxd.spec | 20 +++++++++++++++++++- 7 files changed, 55 insertions(+), 20 deletions(-) delete mode 100644 lxd-4.11.tar.gz delete mode 100644 lxd-4.11.tar.gz.asc create mode 100644 lxd-4.12.tar.gz create mode 100644 lxd-4.12.tar.gz.asc diff --git a/lxd-4.11.tar.gz b/lxd-4.11.tar.gz deleted file mode 100644 index c20cb40..0000000 --- a/lxd-4.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d70bb0a07b6b343b1ff4b06f62d11147d205b30a808abc13978ea18ebed8fdd -size 14903268 diff --git a/lxd-4.11.tar.gz.asc b/lxd-4.11.tar.gz.asc deleted file mode 100644 index 0741096..0000000 --- a/lxd-4.11.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmAcY5gACgkQxjiXTWR5 -LWfSGA//XvggdoBCYETNspkZjaQurnZ8JFFnAz8WncEGMoD27iGdaeydM2JG1RzZ -WEd/ql13Ee3ZwQNCJtwVMgasubi8FxUsAjlumJey85VMqzYauMGY6bBO/xpj+Lkb -Kr2YOaJR/rw0GfiIgUi7MiDlnZ5oBj5HR7TldFzU52h8+fCPeYorkFkzaxiLwlTr -Cvrw2aQVdmpMKdouNfcwQHtjpLDkMiF8+/zDbHTF/1oaXUYvypQcUcNDS5qNTBIZ -MbXWK/0QyhFGztIVyqo3gkYKLsjhX8u6UboEYohTuAwnMDdOim7mTMjY9PWMdYmV -OlTCH04mMKZd1+TVSJOYCUXKbUmMrTcfTJjrUB1p+k9E45OzdG5k2yWIhNLGSu5w -IauvSYT7vinQmIRzRufVp3pEkbijrzeJ3+vj+mZUcLq1q+jk+5QeyIfJC3tmYkkR -w7Q1LhHBcpMJqLi4h1dt6QSrcB3yqkhVEy7SOR6wvoTcepN62tgqIfOXT6IM0EJA -jnWOwTvis0j0FQ4qdsJJaGyOF/lkkU9sZrPZX6LAIMx1oBYkpKnoW4hvZIJ57PiT -pqnVLz8/YEkXRyfPlSlBIA+D2p5YlfHnUM8CN3ykW8np8EqwVw21X08iVgtfmJ8A -tK6Gbzeet3up0EhEolrYyTLMkbdRHNS5lNdb8kxKJMN1n87WbuE= -=KQZ7 ------END PGP SIGNATURE----- diff --git a/lxd-4.12.tar.gz b/lxd-4.12.tar.gz new file mode 100644 index 0000000..c803cc8 --- /dev/null +++ b/lxd-4.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c5b87eb20e49f11084afb29224b6bad7a69bbdd8eaa99941c106149234bf1e1 +size 15605223 diff --git a/lxd-4.12.tar.gz.asc b/lxd-4.12.tar.gz.asc new file mode 100644 index 0000000..3164c76 --- /dev/null +++ b/lxd-4.12.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAmBBpE4ACgkQxjiXTWR5 +LWeNbQ/9EPt6OCvZVapdnByQJEaOjqru5sxXJXUppcVSZJ39jM/W5uA3emoJzUhZ ++H3p93AYlVqYr7yNA1d2ZFJeejzvV9QONZqeL917+EnIOSy+BnNrqc/Sxxqu3J89 +D3Zbauejm31U+v5C1FaJrIXiO5wn3vmCcYfRCI/PVj9F4I/m/NvnDRm7zSlRAqzK +9LgFKi5lDwr02iejYNM4eikLpU80a6zjxo3ymoDTpKEJhPPHaDDN2Djr6Vri1Fsp +EuqijPawdTwDy2hoZQbcbgiGtVwqJfvP1YGgmgdmkwoW9wdItuGNTq+q4kZDBXi7 +hTkOtkDg+l4gbWe2ZqUcd0kBlVPRbs2tdrAiBGbgfed561+hwpgqA8FGxLqZltzc +3+in2VdZmbJPfpz0aiulfAfTZdyfKPTUKdlFfH6Uu3UJkM4eN9FLu/Dvk4VlcLxI +FMRlAIulquXZ6ZpW6tlX13M795nqukjaJ8LbJ0ztMGMIsgNVgNrtIOdwJ26e8g/y +jR/kG0IxUEfmWQY/QW8j8v96a+/YqHdIiS5HXf0G2fKk6G6w7hBOH+tedYxQcneg +ZFnt3cjT2BslReryIuSs4Mcr+mFp1j1hR0QjcT9CopAysNJe8/qBSIcjz42skBHc +M05GDjwOiwIfgp+YKYuBvpswndnoNpwR7p++Ncan70GeSM3uXkw= +=4mxK +-----END PGP SIGNATURE----- diff --git a/lxd.changes b/lxd.changes index 42de757..ae72d95 100644 --- a/lxd.changes +++ b/lxd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 5 16:31:52 UTC 2021 - Aleksa Sarai + +- Update to LXD 4.12. The full upstream changelog is available from: + https://discuss.linuxcontainers.org/t/lxd-4-12-has-been-released/10424 + boo#1183111 + + + Initial Network ACLs support (OVN-only) + + Project restricted certificates + + Server configuration options now supported at the project level + + Configuration option for Ceph features + * Projects now supported by lxd init --dump and --preseed + * Initial auto-generated REST-API documentation + + + VM: Stateful stop and stateful snapshots for virtual machines + ------------------------------------------------------------------- Fri Feb 5 07:41:04 UTC 2021 - Aleksa Sarai diff --git a/lxd.service b/lxd.service index f9da089..75d9ce7 100644 --- a/lxd.service +++ b/lxd.service @@ -5,6 +5,7 @@ Requires=network-online.target lxcfs.service Documentation=man:lxd(1) [Service] +Environment=LXD_OVMF_PATH=/opt/lxd/ovmf ExecStart=/usr/bin/lxd --group=lxd --logfile=/var/log/lxd/lxd.log ExecStartPost=/usr/bin/lxd waitready --timeout=600 TimeoutStartSec=600s diff --git a/lxd.spec b/lxd.spec index 94ced0b..eab4ae1 100644 --- a/lxd.spec +++ b/lxd.spec @@ -22,8 +22,10 @@ %define _buildshell /bin/bash %define import_path github.com/lxc/lxd +%define lxd_optdir /opt/lxd + Name: lxd -Version: 4.11 +Version: 4.12 Release: 0 Summary: Container hypervisor based on LXC License: Apache-2.0 @@ -67,6 +69,11 @@ Requires: rsync Requires: squashfs Requires: tar Requires: xz +# Needed for VM support. +Requires: qemu-ovmf-x86_64 +BuildRequires: qemu-ovmf-x86_64 +Requires: qemu-ui-spice-core +Requires: qemu-x86 # Storage backends -- we don't recommend ZFS since it's not *technically* a # blessed configuration. Recommends: lvm2 @@ -283,6 +290,15 @@ install -D -m 0644 %{S:201} %{buildroot}%{_sysconfdir}/dnsmasq.d/60-lxd.conf install -d -m 0711 %{buildroot}%{_localstatedir}/lib/%{name} install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name} +# In order for VM support in LXD to function, you need to have OVMF configured +# in the way it expects. In particular, LXD depends on specific filenames for +# the firmware files so we create fake ones with symlinks. +export OVMF_DIR="%{buildroot}%{lxd_optdir}/ovmf" +mkdir -p "$OVMF_DIR" +ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-code.bin "$OVMF_DIR/OVMF_CODE.fd" +ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-vars.bin "$OVMF_DIR/OVMF_VARS.ms.fd" +ln -s %{_datarootdir}/qemu/ovmf-x86_64-vars.bin "$OVMF_DIR/OVMF_VARS.fd" + %fdupes %{buildroot} %pre @@ -338,6 +354,8 @@ grep -q '^root:' /etc/subgid || \ %{_sbindir}/rc%{name} %{_unitdir}/%{name}.service +%{lxd_optdir} + %dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/log/%{name}