Merge branch 'aria2' into 'master'

Fix aria2

See merge request fablab/labsync!14

Makefile

@@ -52,6 +52,7 @@ images/debian-stretch.squashfs: images
 		--rm \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v "${PWD}/packer:/workdir" \
+		-v "${PWD}/aria2c:/workdir/aria2c" \
 		-v "${PWD}/images:/images" \
 		-e "user=`id -u`" \
 		-e "group=`id -g`" \

docker/entrypoint.sh

@@ -37,8 +37,6 @@ make_torrent() {
 }
 
 run_packer() {
-    touch /aria2c
-
 	packer build "$NAME.json"
 
 	if [ "$user" != "" ] && [ "$group" != "" ]; then

packer/debian-stretch.json

@@ -36,7 +36,7 @@
   "provisioners": [
     {
       "type": "file",
-      "source": "/aria2c",
+      "source": "aria2c",
       "destination": "/usr/local/bin/aria2c"
     },
     {
@@ -64,7 +64,7 @@
         "echo \"LABSYNC_PROJECT_URL='{{user `ci_project_url`}}'\" >> /etc/environment",
         "set -x",
         "sed -i 's#@@PROJECT_URL@@#{{user `ci_project_url`}}#' /etc/initramfs-tools/scripts/labsync",
-		"if [ -s /usr/local/bin/aria2c ]; then aria2c=/usr/local/bin/aria2c; else aria2c=/usr/bin/aria2c; fi",
+		"if ! [ -d /usr/local/bin/aria2c ]; then aria2c=/usr/local/bin/aria2c; else aria2c=/usr/bin/aria2c; fi",
 	    "sed -i \"s#@@ARIA2C@@#$aria2c#\" /etc/initramfs-tools/scripts/local-premount/labsync-prereqs",
         "apt-get update",
         "apt-get -y dist-upgrade",

packer/initramfs/labsync

@@ -80,6 +80,7 @@ labsync_premount() {
 
 
 labsync_mount_root() {
+	export PATH="/usr/local/bin:$PATH"
 	set -x
 	sed -i 's/use_lvmetad = 1/use_lvmetad = 0/' /etc/lvm/lvm.conf
 	vg_name="vglab"