From 2a3a643db1c744e68eb6a40a612b72c8309a1688 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 13 Feb 2022 06:12:31 +0000 Subject: [PATCH 1/3] Upgrade to v4.23 --- conf/lxd.src | 4 ++-- manifest.json | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/conf/lxd.src b/conf/lxd.src index 1d0ed33..7509f76 100644 --- a/conf/lxd.src +++ b/conf/lxd.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.22/lxd-4.22.tar.gz -SOURCE_SUM=0977e4b8ae854278194b15f3dc6472d217b9619a024d03f60e95393352212385 +SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.23/lxd-4.23.tar.gz +SOURCE_SUM=6cfcc7f4c462ae09776ffc24918211844bebcafcbfe4cd98f4b2cfa83e082fc5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2eb8e68..9d16181 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Offers a user experience similar to virtual machines but using Linux containers instead.", "fr": "Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place." }, - "version": "4.22~ynh2", + "version": "4.23~ynh1", "url": "https://example.com", "upstream": { "license": "Apache-2.0", @@ -24,11 +24,8 @@ "yunohost": ">= 4.2.8" }, "multi_instance": false, - "services": [ - ], + "services": [], "arguments": { - "install" : [ - - ] + "install": [] } } From 53fcfa7108c5f07c0e72301481c7c42aed49c203 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 13 Feb 2022 06:12:36 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a93048..330316f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Offers a user experience similar to virtual machines but using Linux containers instead. -**Shipped version:** 4.22~ynh2 +**Shipped version:** 4.23~ynh1 **Demo:** https://linuxcontainers.org/lxd/try-it/ diff --git a/README_fr.md b/README_fr.md index 6f3a863..8d3ff19 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place. -**Version incluse :** 4.22~ynh2 +**Version incluse :** 4.23~ynh1 **Démo :** https://linuxcontainers.org/lxd/try-it/ From efb7a823b77725c730d78561f73cc173edd57503 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 15 Feb 2022 12:03:17 +0100 Subject: [PATCH 3/3] remove lxd-p2c, add lxd-migrate & lxd-user --- scripts/backup | 3 ++- scripts/install | 2 +- scripts/remove | 3 ++- scripts/restore | 3 ++- scripts/upgrade | 7 ++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/backup b/scripts/backup index 68d5336..5d5c634 100755 --- a/scripts/backup +++ b/scripts/backup @@ -56,7 +56,8 @@ ynh_backup --src_path="/usr/local/bin/lxc-to-lxd" ynh_backup --src_path="/usr/local/bin/lxd" ynh_backup --src_path="/usr/local/bin/lxd-agent" ynh_backup --src_path="/usr/local/bin/lxd-benchmark" -ynh_backup --src_path="/usr/local/bin/lxd-p2c" +ynh_backup --src_path="/usr/local/bin/lxd-migrate" +ynh_backup --src_path="/usr/local/bin/lxd-user" ynh_backup --src_path="/etc/bash_completion.d/lxd-client" ynh_backup --src_path="/etc/dnsmasq.d/lxd" diff --git a/scripts/install b/scripts/install index 3beab44..d25d182 100755 --- a/scripts/install +++ b/scripts/install @@ -78,7 +78,7 @@ ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ -cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin +cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ popd diff --git a/scripts/remove b/scripts/remove index 9e35a2c..4bbf943 100755 --- a/scripts/remove +++ b/scripts/remove @@ -78,7 +78,8 @@ ynh_secure_remove --file="/usr/local/bin/lxc-to-lxd" ynh_secure_remove --file="/usr/local/bin/lxd" ynh_secure_remove --file="/usr/local/bin/lxd-agent" ynh_secure_remove --file="/usr/local/bin/lxd-benchmark" -ynh_secure_remove --file="/usr/local/bin/lxd-p2c" +ynh_secure_remove --file="/usr/local/bin/lxd-migrate" +ynh_secure_remove --file="/usr/local/bin/lxd-user" ynh_secure_remove --file="/etc/bash_completion.d/lxd-client" sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id diff --git a/scripts/restore b/scripts/restore index ad88a27..b2e217f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -78,7 +78,8 @@ ynh_restore_file --origin_path="/usr/local/bin/lxc-to-lxd" ynh_restore_file --origin_path="/usr/local/bin/lxd" ynh_restore_file --origin_path="/usr/local/bin/lxd-agent" ynh_restore_file --origin_path="/usr/local/bin/lxd-benchmark" -ynh_restore_file --origin_path="/usr/local/bin/lxd-p2c" +ynh_restore_file --origin_path="/usr/local/bin/lxd-migrate" +ynh_restore_file --origin_path="/usr/local/bin/lxd-user" ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client" ynh_restore_file --origin_path="/etc/dnsmasq.d/lxd" diff --git a/scripts/upgrade b/scripts/upgrade index 4b660e9..231db79 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,6 +23,11 @@ ynh_script_progression --message="Ensuring downward compatibility..." sed -i "/root:1000000:65536 # Added by lxd#/d" /etc/sub{u,g}id +# Remove old file +if [ -f "/usr/local/bin/lxd-p2c" ]; then + ynh_secure_remove --file="/usr/local/bin/lxd-p2c" +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -96,7 +101,7 @@ ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ -cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin +cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ popd