Merge branch 'variable-debug' into 'master'

make debugging optional

See merge request fablab/labsync!19

Makefile

@@ -159,7 +159,7 @@ qemu: qemu-network $(qemu_disk) docker-services
 		-kernel "images/$(qemu_kernel)" \
 		-initrd "images/$(qemu_initramfs)" \
 		-drive format=raw,file="$(qemu_disk)" \
-		-append "boot=labsync labsync_disk=sda labsync_partsize_boot=512 labsync_torrent=http://10.2.2.1/$(qemu_torrent) quiet vga=792 ip=$(qemu_vm_ip):::255.255.255.0:$(qemu_hostname):ens3:off labsync_wait=pause" \
+		-append "boot=labsync labsync_disk=sda labsync_partsize_boot=512 labsync_torrent=http://10.2.2.1/$(qemu_torrent) quiet vga=792 ip=$(qemu_vm_ip):::255.255.255.0:$(qemu_hostname):ens3:off labsync_wait=pause labsync_debug=1" \
 		-enable-kvm \
 		-m 1G \
 		-net nic \

packer/initramfs/labsync

@@ -81,7 +81,7 @@ labsync_premount() {
 
 labsync_mount_root() {
 	export PATH="/usr/local/bin:$PATH"
-	set -x
+	[ "$labsync_debug" = 1 ] && set -x
 	sed -i 's/use_lvmetad = 1/use_lvmetad = 0/' /etc/lvm/lvm.conf
 	vg_name="vglab"
 	if [ -z "$labsync_localboot" ]; then
@@ -207,6 +207,7 @@ PARTTABLE
 			sleep $labsync_wait
 			;;
 	esac
+	set +x
 }
 
 labsync_bottom() {