From f38872c9ebd6e2e278235b68a344ccae9d0f5369 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost-bot@users.noreply.github.com>
Date: Mon, 25 Jul 2022 06:17:12 +0000
Subject: [PATCH 1/7] Upgrade to v5.4

---
 conf/lxd.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/lxd.src b/conf/lxd.src
index caa9cdd..a4189ab 100644
--- a/conf/lxd.src
+++ b/conf/lxd.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-5.3/lxd-5.3.tar.gz
-SOURCE_SUM=0d174a09fa749cbde58393bf5a6eef5f682b3bf0c1bb2847462f395c8e656995
+SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-5.4/lxd-5.4.tar.gz
+SOURCE_SUM=e234b67c5077d05e22f958e3256bd91f262450545993d0aaf1b4ce2bdb99393a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 4d0dd1d..5e75a52 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": "5.3~ynh1",
+    "version": "5.4~ynh1",
     "url": "https://example.com",
     "upstream": {
         "license": "Apache-2.0",

From d75ce5f508304d65f687f79b4880c06a5e37acb0 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 25 Jul 2022 06:17:16 +0000
Subject: [PATCH 2/7] 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 f4eaa5a..a06355f 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:** 5.3~ynh1
+**Shipped version:** 5.4~ynh1
 
 **Demo:** https://linuxcontainers.org/lxd/try-it/
 ## Disclaimers / important information
diff --git a/README_fr.md b/README_fr.md
index 86042ec..146c589 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,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 :** 5.3~ynh1
+**Version incluse :** 5.4~ynh1
 
 **Démo :** https://linuxcontainers.org/lxd/try-it/
 ## Avertissements / informations importantes

From 189d7138f97dc5c9ffc52e0f6c5f0abb7a048da1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 27 Jul 2022 20:53:30 +0200
Subject: [PATCH 3/7] Apply last example_ynh

---
 doc/DESCRIPTION.md           |   1 +
 doc/DESCRIPTION_fr.md        |   1 +
 doc/DISCLAIMER_fr.md         |   3 +
 doc/screenshots/.gitkeep     |   0
 doc/screenshots/LXD-logo.png | Bin 0 -> 10041 bytes
 manifest.json                |   2 +-
 scripts/_common.sh           |  16 -----
 scripts/backup               |   1 -
 scripts/install              |  68 +++++++++----------
 scripts/remove               |  27 ++++----
 scripts/restore              |  36 +++++-----
 scripts/upgrade              | 123 +++++++++++++++++------------------
 12 files changed, 133 insertions(+), 145 deletions(-)
 create mode 100644 doc/DESCRIPTION.md
 create mode 100644 doc/DESCRIPTION_fr.md
 create mode 100644 doc/DISCLAIMER_fr.md
 create mode 100644 doc/screenshots/.gitkeep
 create mode 100644 doc/screenshots/LXD-logo.png

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..c41d8e6
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+LXD is a next generation system container and virtual machine manager. It offers a unified user experience around full Linux systems running inside containers or virtual machines.
\ No newline at end of file
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..b6581c7
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+LXD est un gestionnaire de conteneurs système et de machines virtuelles de nouvelle génération. Il offre une expérience utilisateur unifiée autour de systèmes Linux complets fonctionnant dans des conteneurs ou des machines virtuelles.
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
new file mode 100644
index 0000000..d745899
--- /dev/null
+++ b/doc/DISCLAIMER_fr.md
@@ -0,0 +1,3 @@
+## Configuration
+
+Comment configurer cette application : en cli
diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/doc/screenshots/LXD-logo.png b/doc/screenshots/LXD-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e344c1ddbdecfdbb9968cb12ccd215f2a0a819a7
GIT binary patch
literal 10041
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

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index 4d0dd1d..8d0e873 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,7 @@
         "email": "pierre@kayou.io"
     },
     "requirements": {
-        "yunohost": ">= 4.2.8"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [],
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 72aa754..37c653b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -100,22 +100,6 @@ ynh_remove_systemd_socket_config () {
 # EXPERIMENTAL HELPERS
 #=================================================
 
-ynh_detect_arch(){
-	local architecture
-	if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
-		architecture="arm64"
-	elif [ -n "$(uname -m | grep 64)" ]; then
-		architecture="x86-64"
-	elif [ -n "$(uname -m | grep 86)" ]; then
-		architecture="i386"
-	elif [ -n "$(uname -m | grep arm)" ]; then
-		architecture="arm"
-	else
-		architecture="unknown"
-	fi
-	echo $architecture
-}
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
diff --git a/scripts/backup b/scripts/backup
index 5d5c634..402b1e8 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
 	true
 }
 # Exit if an error occurs during the execution of the script
diff --git a/scripts/install b/scripts/install
index d25d182..0a5e584 100755
--- a/scripts/install
+++ b/scripts/install
@@ -42,6 +42,14 @@ ynh_script_progression --message="Installing dependencies..." --weight=30
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..."
+
+# Create a system user
+ynh_system_user_create --username=$app
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -49,7 +57,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5
 
 # Download, check integrity, uncompress and patch the source from app.src
 go_tmp=$(mktemp -d)
-ynh_setup_source --dest_dir="$go_tmp" --source_id="go.$(ynh_detect_arch)"
+ynh_setup_source --dest_dir="$go_tmp" --source_id="go.$YNH_ARCH"
 
 export PATH=$go_tmp/bin:$PATH
 
@@ -58,55 +66,38 @@ ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd"
 
 export GOPATH=${lxd_tmp}/vendor/
 
+#=================================================
+# SPECIFIC SETUP
 #=================================================
 # BUILD FROM SOURCES
 #=================================================
 ynh_script_progression --message="Building lxd from sources..." --weight=60
 
 pushd ${lxd_tmp}
+	export HOME=${HOME:-"/root/"}
 
-export HOME=${HOME:-"/root/"}
+	ynh_exec_warn_less make deps
+	export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
+	export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
+	export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
+	export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
 
-ynh_exec_warn_less make deps
-export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
-export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
-export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
-export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
+	ynh_exec_warn_less make
 
-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-migrate,lxd-user} /usr/local/bin
-cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
+	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-migrate,lxd-user} /usr/local/bin
+	cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
 popd
 
 ynh_secure_remove --file="$go_tmp"
 ynh_secure_remove --file="$lxd_tmp"
 
 #=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..."
-
-# Create a system user
-ynh_system_user_create --username=$app
-
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_socket_config
-ynh_add_systemd_config
-
-#=================================================
-# MODIFY A CONFIG FILE
+# ADD A CONFIGURATION
 #=================================================
+ynh_script_progression --message="Adding a configuration file..."
 
 echo "bind-interfaces
 except-interface=lxdbr0" > /etc/dnsmasq.d/lxd
@@ -123,6 +114,15 @@ ldconfig
 echo "# Added by lxd
 root:100000:65536" | tee -a /etc/subuid /etc/subgid
 
+#=================================================
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Configuring a systemd service..."
+
+# Create a dedicated systemd config
+ynh_add_systemd_socket_config
+ynh_add_systemd_config
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 4bbf943..95203ad 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -35,8 +35,19 @@ fi
 ynh_script_progression --message="Stopping and removing the systemd service..."
 
 # Remove the dedicated systemd config
-ynh_remove_systemd_socket_config
-ynh_exec_warn_less  ynh_remove_systemd_config
+ynh_exec_warn_less ynh_remove_systemd_socket_config
+ynh_exec_warn_less ynh_remove_systemd_config
+
+#=================================================
+# REMOVE CONTAINERS
+#=================================================
+
+# Remove the data directory if --purge option is used
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+	ynh_script_progression --message="Removing containers..."
+	ynh_secure_remove --file="/var/lib/lxd"
+fi
 
 #=================================================
 # REMOVE DEPENDENCIES
@@ -61,6 +72,7 @@ fi
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
+ynh_script_progression --message="Removing various files..."
 
 # Remove a directory securely
 ynh_secure_remove --file="/etc/ld.so.conf.d/$app.conf"
@@ -98,17 +110,6 @@ ynh_script_progression --message="Removing the dedicated system user..."
 # Delete a system user
 ynh_system_user_delete --username=$app
 
-#=================================================
-# REMOVE CONTAINERS
-#=================================================
-
-# Remove the data directory if --purge option is used
-if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
-then
-	ynh_script_progression --message="Removing containers..."
-	ynh_secure_remove --file="/var/lib/lxd"
-fi
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index b2e217f..635c162 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,8 +15,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	#### Remove this function if there's nothing to clean before calling the remove script.
-	true
+	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
@@ -48,25 +47,10 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=30
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..."
-
-ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-ynh_restore_file --origin_path="/etc/systemd/system/$app.socket"
-systemctl enable $app.service --quiet
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --log="/var/log/$app/$app.log"
-
 #=================================================
 # RESTORE VARIOUS FILES
 #=================================================
+ynh_script_progression --message="Restoring various files..."
 
 ynh_restore_file --origin_path="/var/log/$app/"
 
@@ -93,6 +77,22 @@ ldconfig
 echo "# Added by lxd
 root:100000:65536" | tee -a /etc/subuid /etc/subgid
 
+#=================================================
+# RESTORE SYSTEMD
+#=================================================
+ynh_script_progression --message="Restoring the systemd configuration..."
+
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app.socket"
+systemctl enable $app.service --quiet
+
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
+
+yunohost service add $app --log="/var/log/$app/$app.log"
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index de91b2f..0048c21 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,13 +16,6 @@ ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."
-
-sed -i "/root:1000000:65536 # Added by lxd#/d" /etc/sub{u,g}id
-
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -57,56 +50,11 @@ ynh_systemd_action --service_name="$app.socket" --action="stop"
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
-# UPGRADE DEPENDENCIES
+# ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..."
+ynh_script_progression --message="Ensuring downward compatibility..."
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
-#=================================================
-ynh_script_progression --message="Setting up source files..."
-
-# Download, check integrity, uncompress and patch the source from app.src
-go_tmp=$(mktemp -d)
-ynh_setup_source --dest_dir="$go_tmp" --source_id="go.$(ynh_detect_arch)"
-
-export PATH=$go_tmp/bin:$PATH
-
-lxd_tmp=$(mktemp -d)
-ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd"
-
-export GOPATH=${lxd_tmp}/vendor/
-
-#=================================================
-# BUILD FROM SOURCES
-#=================================================
-ynh_script_progression --message="Building lxd from sources..." --weight=60
-
-pushd ${lxd_tmp}
-
-export HOME=${HOME:-"/root/"}
-
-ynh_exec_warn_less make deps
-export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
-export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
-export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
-export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
-
-export GOCACHE=$go_tmp
-
-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-migrate,lxd-user} /usr/local/bin
-cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
-popd
-
-ynh_secure_remove --file="$go_tmp"
-ynh_secure_remove --file="$lxd_tmp"
+sed -i "/root:1000000:65536 # Added by lxd#/d" /etc/sub{u,g}id
 
 #=================================================
 # CREATE DEDICATED USER
@@ -116,20 +64,63 @@ ynh_script_progression --message="Making sure dedicated system user exists..."
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
 
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Setting up source files..."
+
+# Download, check integrity, uncompress and patch the source from app.src
+go_tmp=$(mktemp -d)
+ynh_setup_source --dest_dir="$go_tmp" --source_id="go.$YNH_ARCH"
+
+export PATH=$go_tmp/bin:$PATH
+
+lxd_tmp=$(mktemp -d)
+ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd"
+
+export GOPATH=${lxd_tmp}/vendor/
+
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..."
+
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
-# SETUP SYSTEMD
+# BUILD FROM SOURCES
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..."
+ynh_script_progression --message="Building lxd from sources..." --weight=60
 
-# Create a dedicated systemd config
-ynh_add_systemd_socket_config
-ynh_add_systemd_config
+pushd ${lxd_tmp}
+	export HOME=${HOME:-"/root/"}
+
+	ynh_exec_warn_less make deps
+	export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
+	export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
+	export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
+	export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
+
+	export GOCACHE=$go_tmp
+
+	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-migrate,lxd-user} /usr/local/bin
+	cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
+popd
+
+ynh_secure_remove --file="$go_tmp"
+ynh_secure_remove --file="$lxd_tmp"
 
 #=================================================
-# MODIFY A CONFIG FILE
+# UPDATE A CONFIG FILE
 #=================================================
+ynh_script_progression --message="Updating a configuration file..."
 
 ynh_backup_if_checksum_is_different --file="/etc/dnsmasq.d/lxd"
 
@@ -150,6 +141,15 @@ ldconfig
 echo "# Added by lxd
 root:100000:65536" | tee -a /etc/subuid /etc/subgid
 
+#=================================================
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Upgrading systemd configuration..."
+
+# Create a dedicated systemd config
+ynh_add_systemd_socket_config
+ynh_add_systemd_config
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -164,7 +164,6 @@ yunohost service add $app --log="/var/log/$app/$app.log"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-# Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================

From 2c02dfc6df9ffae0386b27201959d972c815c295 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 27 Jul 2022 21:00:08 +0200
Subject: [PATCH 4/7] Fix amd64 source

---
 conf/{go.x86-64.src => go.amd64.src} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conf/{go.x86-64.src => go.amd64.src} (100%)

diff --git a/conf/go.x86-64.src b/conf/go.amd64.src
similarity index 100%
rename from conf/go.x86-64.src
rename to conf/go.amd64.src

From d3fbcaf70450f471aa45f6ed0e0c925481800bb1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 27 Jul 2022 21:22:13 +0200
Subject: [PATCH 5/7] Update DESCRIPTION_fr.md

---
 doc/DESCRIPTION_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index b6581c7..fe0169b 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -1 +1 @@
-LXD est un gestionnaire de conteneurs système et de machines virtuelles de nouvelle génération. Il offre une expérience utilisateur unifiée autour de systèmes Linux complets fonctionnant dans des conteneurs ou des machines virtuelles.
+LXD est un gestionnaire de conteneurs système et de machines virtuelles de nouvelle génération. Il offre une expérience utilisateur unifiée autour de systèmes Linux complets fonctionnant dans des conteneurs ou des machines virtuelles.

From 9a06c85aba4fff4bc18463ad3a9a286382d38aaf Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 27 Jul 2022 19:22:18 +0000
Subject: [PATCH 6/7] Auto-update README

---
 README.md    |  7 ++++++-
 README_fr.md | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f4eaa5a..f9a5a3c 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,16 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Offers a user experience similar to virtual machines but using Linux containers instead.
+LXD is a next generation system container and virtual machine manager. It offers a unified user experience around full Linux systems running inside containers or virtual machines.
 
 **Shipped version:** 5.3~ynh1
 
 **Demo:** https://linuxcontainers.org/lxd/try-it/
+
+## Screenshots
+
+![Screenshot of LXD](./doc/screenshots/LXD-logo.png)
+
 ## Disclaimers / important information
 
 ## Configuration
diff --git a/README_fr.md b/README_fr.md
index 86042ec..af6326c 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -15,16 +15,22 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place.
+LXD est un gestionnaire de conteneurs système et de machines virtuelles de nouvelle génération. Il offre une expérience utilisateur unifiée autour de systèmes Linux complets fonctionnant dans des conteneurs ou des machines virtuelles.
+
 
 **Version incluse :** 5.3~ynh1
 
 **Démo :** https://linuxcontainers.org/lxd/try-it/
+
+## Captures d'écran
+
+![Capture d'écran de LXD](./doc/screenshots/LXD-logo.png)
+
 ## Avertissements / informations importantes
 
 ## Configuration
 
-How to configure this app: In cli
+Comment configurer cette application : en cli
 
 ## Documentations et ressources
 

From fe0ddada98c7c24c5eee9907e47584379e3a1b51 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Tue, 2 Aug 2022 16:02:56 +0200
Subject: [PATCH 7/7] Bump go version

---
 conf/go.amd64.src | 4 ++--
 conf/go.arm.src   | 4 ++--
 conf/go.arm64.src | 4 ++--
 conf/go.i386.src  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/go.amd64.src b/conf/go.amd64.src
index 21b66db..71eb790 100644
--- a/conf/go.amd64.src
+++ b/conf/go.amd64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://go.dev/dl/go1.18.linux-amd64.tar.gz
-SOURCE_SUM=e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f
+SOURCE_URL=https://go.dev/dl/go1.18.5.linux-amd64.tar.gz
+SOURCE_SUM=9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.arm.src b/conf/go.arm.src
index ba5efc9..7f4d622 100644
--- a/conf/go.arm.src
+++ b/conf/go.arm.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://go.dev/dl/go1.18.linux-armv6l.tar.gz
-SOURCE_SUM=a80fa43d1f4575fb030adbfbaa94acd860c6847820764eecb06c63b7c103612b
+SOURCE_URL=https://go.dev/dl/go1.18.5.linux-armv6l.tar.gz
+SOURCE_SUM=d5ac34ac5f060a5274319aa04b7b11e41b123bd7887d64efb5f44ead236957af
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.arm64.src b/conf/go.arm64.src
index 10e72b6..9f4b858 100644
--- a/conf/go.arm64.src
+++ b/conf/go.arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://go.dev/dl/go1.18.linux-arm64.tar.gz
-SOURCE_SUM=7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e
+SOURCE_URL=https://go.dev/dl/go1.18.5.linux-arm64.tar.gz
+SOURCE_SUM=006f6622718212363fa1ff004a6ab4d87bbbe772ec5631bab7cac10be346e4f1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.i386.src b/conf/go.i386.src
index 756c57d..88c74f0 100644
--- a/conf/go.i386.src
+++ b/conf/go.i386.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://go.dev/dl/go1.18.linux-386.tar.gz
-SOURCE_SUM=1c04cf4440b323a66328e0df95d409f955b9b475e58eae235fdd3d1f1cf02f4f
+SOURCE_URL=https://go.dev/dl/go1.18.5.linux-386.tar.gz
+SOURCE_SUM=0c44f85d146c6f98c34e8ff436a42af22e90e36fe232d3d9d3101f23fd61362b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true