From 7b0cd76b2e2e36e41464f43e4b77e022238068db Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 12 Dec 2018 18:23:55 +0000
Subject: [PATCH 01/19] Be able to selects which tests to run

---
 ynh-dev | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ynh-dev b/ynh-dev
index db693be..1e92cef 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -270,10 +270,17 @@ function run_tests()
     local PACKAGES="$@"
     for PACKAGE in "$PACKAGES";
     do
+        local TEST_MODULE=""
+        if [[ "$PACKAGE" == *"/"* ]]
+        then
+            TEST_MODULE=$(echo "$PACKAGE" | awk -F'/' '{print $2}')
+            PACKAGE=$(echo "$PACKAGE" | awk -F'/' '{print $1}')
+        fi
+
         case $PACKAGE in
             yunohost)
                 # Pytest and tests dependencies
-                if ! type "pytest" > /dev/null; then
+                if ! type "pytest" > /dev/null 2>&1; then
                     info "> Installing pytest ..."
                     apt-get install python-pip -y
                     pip2 install pytest
@@ -294,10 +301,16 @@ function run_tests()
 
                 # Run tests
                 echo "Running tests for YunoHost"
-                cd /ynh-dev/yunohost/
-                py.test tests
-                cd /ynh-dev/yunohost/src/yunohost
-                py.test tests
+                if [[ -z "$TEST_MODULE" ]]
+                then
+                    cd /ynh-dev/yunohost/
+                    py.test tests
+                    cd /ynh-dev/yunohost/src/yunohost
+                    py.test tests
+                else
+                    cd /ynh-dev/yunohost/src/yunohost
+                    py.test tests/test_"$TEST_MODULE".py
+                fi
                 ;;
         esac
     done

From 488ef0325b7addef4f4597a76cddb4cd5e8f9275 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 16 Sep 2017 11:46:16 +0200
Subject: [PATCH 02/19] Use --no-bin-links option for npm install to prevent
 from using symbolic links

---
 ynh-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ynh-dev b/ynh-dev
index adbd087..8f2c50c 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -238,7 +238,7 @@ function use_git()
                     sudo apt install nodejs
 
                     cd /ynh-dev/yunohost-admin/src
-                    sudo npm install
+                    sudo npm install --no-bin-links
                     sudo npm install -g bower
                     sudo npm install -g gulp
                 fi

From 19e7fae061b7df4f5f17d573e253d406758092a3 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 15 Dec 2018 16:13:22 +0000
Subject: [PATCH 03/19] Be able to test specific functions

---
 ynh-dev | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ynh-dev b/ynh-dev
index 6287767..9ff6142 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -17,6 +17,8 @@ function show_usage() {
   ip              Give the ip of the guest container
   use-git [PKG]   Use Git repositories from dev environment path
   test [PKG]      Deploy, update and run tests for some packages
+                  Tests for single modules and functions can ran with
+                  e.g. ./ynh-dev test yunohost/appurl:urlavailable
 
 EOF
 }
@@ -270,12 +272,9 @@ function run_tests()
     local PACKAGES="$@"
     for PACKAGE in "$PACKAGES";
     do
-        local TEST_MODULE=""
-        if [[ "$PACKAGE" == *"/"* ]]
-        then
-            TEST_MODULE=$(echo "$PACKAGE" | awk -F'/' '{print $2}')
-            PACKAGE=$(echo "$PACKAGE" | awk -F'/' '{print $1}')
-        fi
+        TEST_FUNCTION=$(echo "$PACKAGE" | tr '/:' ' ' | awk '{print $3}')
+        TEST_MODULE=$(echo "$PACKAGE" | tr '/:' ' ' | awk '{print $2}')
+        PACKAGE=$(echo "$PACKAGE" | tr '/:' ' ' | awk '{print $1}')
 
         case $PACKAGE in
             yunohost)
@@ -310,7 +309,12 @@ function run_tests()
                     py.test tests
                 else
                     cd /ynh-dev/yunohost/src/yunohost
-                    py.test tests/test_"$TEST_MODULE".py
+                    if [[ -z "$TEST_FUNCTION" ]]
+                    then
+                        py.test tests/test_"$TEST_MODULE".py
+                    else
+                        py.test tests/test_"$TEST_MODULE".py::test_"$TEST_FUNCTION"
+                    fi
                 fi
                 ;;
         esac

From 56b5fbcaedb4bcedcfad8b88815656e735805791 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Sat, 15 Dec 2018 17:24:38 +0100
Subject: [PATCH 04/19] Update ynh-dev

---
 ynh-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ynh-dev b/ynh-dev
index 9ff6142..853a38c 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -299,7 +299,7 @@ function run_tests()
                 git pull > /dev/null 2>&1
 
                 # Run tests
-                echo "Running tests for YunoHost"
+                info "Running tests for YunoHost"
                 [ -e "/etc/yunohost/installed" ] || critical "You should run postinstallation before running tests :s."
                 if [[ -z "$TEST_MODULE" ]]
                 then

From db04eb94639dc966e9f991bb004e0e62acabfabc Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 17 Jan 2019 20:40:10 +0100
Subject: [PATCH 05/19] Add note about install on Debian Buster

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 06850f3..0900cd0 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,8 @@ lxc-checkconfig
 echo "veth" | sudo tee -a /etc/modules
 ```
 
+On Debian Buster, I had to re-patch the driver.rb of vagrant-lxc plugin with [this version](https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb) (especially the `roofs_path` function). I also had to install `apparmor` then `systemctl restart apparmor` for `lxc-start` to work.
+
 If you run Archlinux, this page should be quite useful to setup LXC : https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Arch-Linux-hosts
 
 Then, go into your favorite development folder and deploy ynh-dev with : 

From 0a989d0c56338a79b8cdcd4cc5209ac4dcc3a144 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 6 Feb 2019 23:06:15 +0100
Subject: [PATCH 06/19] Add misc tips to configure LXC properly

---
 README.md            | 21 ++++++++++++++++++++-
 prebuild/prebuild.sh |  2 +-
 ynh-dev              | 12 ++++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0900cd0..7367f65 100644
--- a/README.md
+++ b/README.md
@@ -49,10 +49,29 @@ lxc-checkconfig
 echo "veth" | sudo tee -a /etc/modules
 ```
 
-On Debian Buster, I had to re-patch the driver.rb of vagrant-lxc plugin with [this version](https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb) (especially the `roofs_path` function). I also had to install `apparmor` then `systemctl restart apparmor` for `lxc-start` to work.
+On Debian Buster, I had to re-patch the driver.rb of vagrant-lxc plugin with [this version](https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb) (especially the `roofs_path` function). I also had to install `apparmor` then `systemctl restart apparmor` for `lxc-start` to work. Also check instruction on https://feeding.cloud.geek.nz/posts/lxc-setup-on-debian-stretch/
 
 If you run Archlinux, this page should be quite useful to setup LXC : https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Arch-Linux-hosts
 
+Typically `/etc/default/lxc-net` and `/etc/lxc/default.conf` should look like this : 
+
+```
+ > cat /etc/default/lxc-net
+USE_LXC_BRIDGE="true"
+LXC_BRIDGE="lxcbr0"
+LXC_ADDR="10.0.3.1"
+LXC_NETMASK="255.255.255.0"
+LXC_NETWORK="10.0.3.0/24"
+LXC_DHCP_RANGE="10.0.3.2,10.0.3.254"
+LXC_DHCP_MAX="253"
+
+> cat /etc/lxc/default.conf
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
+lxc.net.0.flags = up
+lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
+```
+
 Then, go into your favorite development folder and deploy ynh-dev with : 
 
 ```bash
diff --git a/prebuild/prebuild.sh b/prebuild/prebuild.sh
index 99aaeb7..72cee74 100755
--- a/prebuild/prebuild.sh
+++ b/prebuild/prebuild.sh
@@ -4,7 +4,7 @@
 BOX="ynh-dev"
 
 # Create box
-vagrant up $BOX
+vagrant up $BOX --provider=lxc
 
 # Package box
 vagrant package $BOX --output /tmp/$BOX.box
diff --git a/ynh-dev b/ynh-dev
index 4c17186..9441225 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -113,6 +113,10 @@ function create_sym_link() {
 
 function start_ynhdev()
 {
+    [[ $(systemctl is-active lxc-net) == "active" ]] || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."
+
+    ip a | grep lxcbr0 -q || critical "There is no 'lxcbr0' interface. You probably need to fix your lxc network conf before being able to use lxc's."
+
     local NAME=${1:-ynh-dev}
     local BOX_NAME="yunohost/$NAME"
     local BOX_URL="https://build.yunohost.org/yunohost-$BOX_NAME-lxc.box"
@@ -145,16 +149,20 @@ function destroy_ynhdev()
 
 function rebuild_ynhdev()
 {
+    [[ $(systemctl is-active lxc-net) == "active" ]] || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."
+
+    ip a | grep lxcbr0 -q || critical "There is no 'lxcbr0' interface. You probably need to fix your lxc network conf before being able to use lxc's."
+
     local BOX="ynh-dev"
 
     set -x
     cd prebuild
 
     # Create box
-    vagrant up $BOX
+    vagrant up $BOX --provider=lxc || critical "Could not create the box ?"
 
     # Package box
-    vagrant package $BOX --output /tmp/$BOX.box
+    vagrant package $BOX --output /tmp/$BOX.box || critical "Could not package package the box ?"
 
     # Destroy current box
     vagrant destroy $BOX

From 8074e71d8ae0bd308b55b02897d1109a96022c3f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 18 Feb 2019 16:58:41 +0100
Subject: [PATCH 07/19] Small tweaks to improve the rebuild process

---
 ynh-dev | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ynh-dev b/ynh-dev
index 9441225..d3a4018 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -162,6 +162,7 @@ function rebuild_ynhdev()
     vagrant up $BOX --provider=lxc || critical "Could not create the box ?"
 
     # Package box
+    rm -f /tmp/ynh-dev.box
     vagrant package $BOX --output /tmp/$BOX.box || critical "Could not package package the box ?"
 
     # Destroy current box
@@ -171,7 +172,7 @@ function rebuild_ynhdev()
 
     # User message, and exit
     info "The Vagrant box was packaged to /tmp/$BOX.box"
-    info "You might want to run : vagrant box add 'yunohost/ynh-dev' /tmp/$BOX.box"
+    info "You might want to run : vagrant box add 'yunohost/ynh-dev' /tmp/$BOX.box --force"
 }
 
 function show_vm_ip()

From ee6848dbbcf152ae3d432ab17b2d72ecb66f29d3 Mon Sep 17 00:00:00 2001
From: Bram <cortex@worlddomination.be>
Date: Wed, 27 Feb 2019 19:16:43 +0100
Subject: [PATCH 08/19] [doc] we don't use virtualbox anymore

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7367f65..f042b88 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Please consider using the [latest Vagrant version from their website](https://ww
 - Debian, Ubuntu, Mint
 
 ```bash
-sudo apt-get install vagrant virtualbox git
+sudo apt-get install vagrant git
 ```
 
 The following commands should work on Linux Mint 19 (and possibly on any Debian Stretch?) :

From 57b4d29d089394ad2ac2ef06c3508ba9d92c78f6 Mon Sep 17 00:00:00 2001
From: Bram <cortex@worlddomination.be>
Date: Wed, 27 Feb 2019 19:22:29 +0100
Subject: [PATCH 09/19] [doc] you need to be in the directory to do that

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f042b88..2c18840 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ When ran on the host, the `./ynh-dev` command allows you to manage YunoHost's de
 First, you might want to start a new LXC with :
 
 ```bash
+cd ynh-dev  # if not already done
 ./ynh-dev start
 ```
 

From 29fe543d0558ef6ab485176e167643ce390c5a7e Mon Sep 17 00:00:00 2001
From: Laurent Peuch <cortex@worlddomination.be>
Date: Thu, 28 Feb 2019 22:52:57 +0100
Subject: [PATCH 10/19] [mod] refuse to run for old version of LXC

---
 ynh-dev | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ynh-dev b/ynh-dev
index d3a4018..7331334 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -30,6 +30,8 @@ function main()
 
     [ -z "$ACTION" ] && show_usage && exit 0
 
+    check_lxc_version
+
     case "${ACTION}" in
 
         help|-h|--help)            show_usage     $ARGUMENTS ;;
@@ -111,6 +113,17 @@ function create_sym_link() {
 #               Actions                                          #
 ##################################################################
 
+function check_lxc_version()
+{
+    local LXC_VERSION=$(lxc-info --version)
+
+    if [ "${${LXC_VERSION}:0:1}" != 3 ]
+    then
+        echo "ERROR: you need at least version 3 of LXC otherwise the box won't work"
+        exit 1
+    fi
+}
+
 function start_ynhdev()
 {
     [[ $(systemctl is-active lxc-net) == "active" ]] || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."

From d4b7eab8d26765b7d8aeccdf5610306abbb1ac9b Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Thu, 7 Mar 2019 12:57:13 +0100
Subject: [PATCH 11/19] It need sudo or root mode : either add sudo, either a
 #.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2c18840..4098519 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,8 @@ sudo apt-get install vagrant git
 The following commands should work on Linux Mint 19 (and possibly on any Debian Stretch?) :
 
 ```bash
-apt update
-apt install git vagrant lxc-templates lxctl lxc cgroup-lite redir bridge-utils libc6 debootstrap
+sudo apt update
+sudo apt install git vagrant lxc-templates lxctl lxc cgroup-lite redir bridge-utils libc6 debootstrap
 vagrant plugin install vagrant-lxc
 echo "cgroup        /sys/fs/cgroup        cgroup        defaults    0    0" | sudo tee -a /etc/fstab
 sudo mount /sys/fs/cgroup

From 6aa1a557af57d0121d16f849feb8d8d493c53a21 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 7 Mar 2019 14:58:57 +0100
Subject: [PATCH 12/19] Bad substitution...

---
 ynh-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ynh-dev b/ynh-dev
index 7331334..f93e9ac 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -117,7 +117,7 @@ function check_lxc_version()
 {
     local LXC_VERSION=$(lxc-info --version)
 
-    if [ "${${LXC_VERSION}:0:1}" != 3 ]
+    if [ "${LXC_VERSION:0:1}" != 3 ]
     then
         echo "ERROR: you need at least version 3 of LXC otherwise the box won't work"
         exit 1

From c2b8f459ddc3c3dcda2e8df35bde7879dc95027b Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 7 Mar 2019 15:11:27 +0100
Subject: [PATCH 13/19] Global check prevented to run ynh-dev inside the LXC
 ... factorized stuff to a single check_lxc_setup function

---
 ynh-dev | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/ynh-dev b/ynh-dev
index f93e9ac..326a524 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -30,8 +30,6 @@ function main()
 
     [ -z "$ACTION" ] && show_usage && exit 0
 
-    check_lxc_version
-
     case "${ACTION}" in
 
         help|-h|--help)            show_usage     $ARGUMENTS ;;
@@ -113,22 +111,23 @@ function create_sym_link() {
 #               Actions                                          #
 ##################################################################
 
-function check_lxc_version()
+function check_lxc_setup()
 {
     local LXC_VERSION=$(lxc-info --version)
 
-    if [ "${LXC_VERSION:0:1}" != 3 ]
-    then
-        echo "ERROR: you need at least version 3 of LXC otherwise the box won't work"
-        exit 1
-    fi
+    [[ "${LXC_VERSION:0:1}" == 3 ]] \
+        || critical "You need at least version 3 of LXC otherwise the box won't work"
+
+    [[ $(systemctl is-active lxc-net) == "active" ]] \
+        || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."
+
+    ip a | grep -q lxcbr0 \
+        || critical "There is no 'lxcbr0' interface. You probably need to fix your lxc network conf before being able to use lxc's."
 }
 
 function start_ynhdev()
 {
-    [[ $(systemctl is-active lxc-net) == "active" ]] || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."
-
-    ip a | grep lxcbr0 -q || critical "There is no 'lxcbr0' interface. You probably need to fix your lxc network conf before being able to use lxc's."
+    check_lxc_setup
 
     local NAME=${1:-ynh-dev}
     local BOX_NAME="yunohost/$NAME"
@@ -150,21 +149,21 @@ function start_ynhdev()
 
 function ssh_ynhdev()
 {
+    check_lxc_setup
     local NAME=${1:-ynh-dev}
     vagrant ssh $NAME -c "echo 'You are now inside the LXC !'; cd /ynh-dev; sudo su"
 }
 
 function destroy_ynhdev()
 {
+    check_lxc_setup
     local NAME=${1:-ynh-dev}
     vagrant destroy $NAME
 }
 
 function rebuild_ynhdev()
 {
-    [[ $(systemctl is-active lxc-net) == "active" ]] || critical "Service lxc-net should be running ... You probably need to fix your lxc network conf before being able to use lxc's."
-
-    ip a | grep lxcbr0 -q || critical "There is no 'lxcbr0' interface. You probably need to fix your lxc network conf before being able to use lxc's."
+    check_lxc_setup
 
     local BOX="ynh-dev"
 

From 9b7aa14f858a68155109a44a87cb4224e38a3997 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 8 Mar 2019 17:46:37 +0100
Subject: [PATCH 14/19] Clarify some stuff + add troubleshooting note about
 apparmor

---
 README.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 4098519..a552f23 100644
--- a/README.md
+++ b/README.md
@@ -31,13 +31,7 @@ First you need to install the dependencies. ynh-dev essentially requires git, va
 
 Please consider using the [latest Vagrant version from their website](https://www.vagrantup.com/downloads.html), distribution versions can include weird bugs that have been fixed upstream. If you still prefer to do that, here are the instructions:
 
-- Debian, Ubuntu, Mint
-
-```bash
-sudo apt-get install vagrant git
-```
-
-The following commands should work on Linux Mint 19 (and possibly on any Debian Stretch?) :
+The following commands should work on **Linux Mint 19** (and possibly on any Debian Stretch?) :
 
 ```bash
 sudo apt update
@@ -45,15 +39,15 @@ sudo apt install git vagrant lxc-templates lxctl lxc cgroup-lite redir bridge-ut
 vagrant plugin install vagrant-lxc
 echo "cgroup        /sys/fs/cgroup        cgroup        defaults    0    0" | sudo tee -a /etc/fstab
 sudo mount /sys/fs/cgroup
-lxc-checkconfig 
+lxc-checkconfig
 echo "veth" | sudo tee -a /etc/modules
 ```
 
-On Debian Buster, I had to re-patch the driver.rb of vagrant-lxc plugin with [this version](https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb) (especially the `roofs_path` function). I also had to install `apparmor` then `systemctl restart apparmor` for `lxc-start` to work. Also check instruction on https://feeding.cloud.geek.nz/posts/lxc-setup-on-debian-stretch/
+On **Debian Buster**, I had to re-patch the driver.rb of vagrant-lxc plugin with [this version](https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb) (especially the `roofs_path` function). I also had to install `apparmor` then `systemctl restart apparmor` for `lxc-start` to work. Also check instruction on https://feeding.cloud.geek.nz/posts/lxc-setup-on-debian-stretch/
 
-If you run Archlinux, this page should be quite useful to setup LXC : https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Arch-Linux-hosts
+If you run **Archlinux**, this page should be quite useful to setup LXC : https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Arch-Linux-hosts
 
-Typically `/etc/default/lxc-net` and `/etc/lxc/default.conf` should look like this : 
+On **both Debian and Archlinux**, typically `/etc/default/lxc-net` and `/etc/lxc/default.conf` should look like this :
 
 ```
  > cat /etc/default/lxc-net
@@ -72,7 +66,9 @@ lxc.net.0.flags = up
 lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
 ```
 
-Then, go into your favorite development folder and deploy ynh-dev with : 
+On **Debian Buster**, for backup stuff to work correctly with apparmor, I also had to add `mount options=(ro, remount, bind, rbind),` to `/etc/apparmor.d/lxc/lxc-default-cgns` and restart the apparmor service.
+
+Then, go into your favorite development folder and deploy ynh-dev with :
 
 ```bash
 curl https://raw.githubusercontent.com/yunohost/ynh-dev/master/deploy.sh | bash
@@ -155,7 +151,7 @@ Depending on what you want to achieve, you might want to run the postinstall rig
 Deploy a `ynh-dev` folder at the root of the filesystem with :
 
 ```
-cd / 
+cd /
 curl https://raw.githubusercontent.com/yunohost/ynh-dev/master/deploy.sh | bash
 cd /ynh-dev
 ```

From 10af5d7a20d5fc02d4a8935e1206b3710bdab349 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 11 Mar 2019 17:56:22 +0100
Subject: [PATCH 15/19] Additional note about how to configure apparmor

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a552f23..9c1bc1c 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ lxc.net.0.flags = up
 lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
 ```
 
-On **Debian Buster**, for backup stuff to work correctly with apparmor, I also had to add `mount options=(ro, remount, bind, rbind),` to `/etc/apparmor.d/lxc/lxc-default-cgns` and restart the apparmor service.
+On **Debian Buster**, for backup stuff to work correctly with apparmor, I also had to add `mount options=(ro, remount, bind, rbind),` and `  mount options=(ro, remount, bind, relatime),` to `/etc/apparmor.d/lxc/lxc-default-cgns` and restart the apparmor service.
 
 Then, go into your favorite development folder and deploy ynh-dev with :
 

From dfe49ea19136c6870409bc1021ab19648d3e6870 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 29 Apr 2019 21:50:54 +0200
Subject: [PATCH 16/19] This prebuild.sh ain't used anymoar

---
 prebuild/prebuild.sh | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100755 prebuild/prebuild.sh

diff --git a/prebuild/prebuild.sh b/prebuild/prebuild.sh
deleted file mode 100755
index 72cee74..0000000
--- a/prebuild/prebuild.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Compute box name
-BOX="ynh-dev"
-
-# Create box
-vagrant up $BOX --provider=lxc
-
-# Package box
-vagrant package $BOX --output /tmp/$BOX.box
-
-# Destroy current box
-vagrant destroy $BOX
-
-# User message, and exit
-echo ""
-echo "Your Vagrant box was packaged to /tmp/$BOX.box"
-echo "You might want to run : vagrant box add 'yunohost/ynh-dev' /tmp/$BOX.box"
-exit

From 1d8185103fb4c6892730ea59af48ef0aaad22b1f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 9 May 2019 17:14:47 +0200
Subject: [PATCH 17/19] Somehow, need to use --provision now when rebuilding
 the box

---
 ynh-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ynh-dev b/ynh-dev
index 326a524..52e3938 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -171,7 +171,7 @@ function rebuild_ynhdev()
     cd prebuild
 
     # Create box
-    vagrant up $BOX --provider=lxc || critical "Could not create the box ?"
+    vagrant up $BOX --provider=lxc --provision || critical "Could not create the box ?"
 
     # Package box
     rm -f /tmp/ynh-dev.box

From afbb3356db643407105f3bf5949c6a68fda6cfd3 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 19 May 2019 17:42:08 +0200
Subject: [PATCH 18/19] Some spelling fixes

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9c1bc1c..2c30d8c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# ynh-dev - Yunohost dev environnement manager
+# ynh-dev - Yunohost dev environment manager
 
 Report issues here: https://github.com/yunohost/issues
 
-ynh-dev is a CLI tool to manage your local development environement for YunoHost. This allow you to develop on the various repository of the YunoHost project.
+ynh-dev is a CLI tool to manage your local development environment for YunoHost. This allow you to develop on the various repository of the YunoHost project.
 
 In particular, it allows :
 
@@ -25,7 +25,7 @@ Here is the development flow:
 2. Manage YunoHost's dev LXCs
 3. Developping on your host, and testing in the container
 
-### 1. Setup ynh-dev and the development environnement
+### 1. Setup ynh-dev and the development environment
 
 First you need to install the dependencies. ynh-dev essentially requires git, vagrant, and an LXC ecosystem.
 

From ad84da85b2c463e0f5411117ecf48e678ec43e8f Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 21 May 2019 12:53:36 +0200
Subject: [PATCH 19/19] Point to default language page.

Closes https://github.com/YunoHost/issues/issues/1352.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c30d8c..3925017 100644
--- a/README.md
+++ b/README.md
@@ -170,4 +170,4 @@ any `yunohost` command will run from the code of the git clone. The `use-git` ac
 
 ## More info
 
-[yunohost.org/dev_fr](https://yunohost.org/dev_fr) (in french) not up-to-date.
+* [yunohost.org/dev](https://yunohost.org/dev) not up-to-date.