| 
				
			 | 
			
			
				@@ -1015,7 +1015,7 @@ initialise_mesh() { 
			 | 
		
	
		
			
			| 
				1015
			 | 
			
				1015
			 | 
			
			
				 # User interface for USB drive installs ###################################### 
			 | 
		
	
		
			
			| 
				1016
			 | 
			
				1016
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1017
			 | 
			
				1017
			 | 
			
			
				 function enable_tox_repo { 
			 | 
		
	
		
			
			| 
				1018
			 | 
			
				
			 | 
			
			
				-	chroot "$rootdir" echo 'deb http://download.opensuse.org/repositories/home:/antonbatenev:/tox/Debian_8.0/ /' > /etc/apt/sources.list.d/tox.list 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1018
			 | 
			
			
				+	echo 'deb http://download.opensuse.org/repositories/home:/antonbatenev:/tox/Debian_8.0/ /' > $rootdir/etc/apt/sources.list.d/tox.list 
			 | 
		
	
		
			
			| 
				1019
			 | 
			
				1019
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1020
			 | 
			
				1020
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1021
			 | 
			
				1021
			 | 
			
			
				 	chroot "$rootdir" wget -q http://download.opensuse.org/repositories/home:antonbatenev:tox/Debian_8.0/Release.key -O- | apt-key add - 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1028,13 +1028,11 @@ function install_syncthing { 
			 | 
		
	
		
			
			| 
				1028
			 | 
			
				1028
			 | 
			
			
				 		return 
			 | 
		
	
		
			
			| 
				1029
			 | 
			
				1029
			 | 
			
			
				 	fi 
			 | 
		
	
		
			
			| 
				1030
			 | 
			
				1030
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1031
			 | 
			
				
			 | 
			
			
				-	chroot "$rootdir" apt-get -y install curl 
			 | 
		
	
		
			
			| 
				1032
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				1033
			 | 
			
				
			 | 
			
			
				-	chroot "$rootdir" wget -q ttps://syncthing.net/release-key.txt -O- | apt-key add - 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1031
			 | 
			
			
				+	chroot "$rootdir" wget -q https://syncthing.net/release-key.txt -O- | apt-key add - 
			 | 
		
	
		
			
			| 
				1034
			 | 
			
				1032
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1035
			 | 
			
				1033
			 | 
			
			
				 	echo "deb http://apt.syncthing.net/ syncthing release" | tee $rootdir/etc/apt/sources.list.d/syncthing.list 
			 | 
		
	
		
			
			| 
				1036
			 | 
			
				1034
			 | 
			
			
				 	chroot "$rootdir" apt-get update 
			 | 
		
	
		
			
			| 
				1037
			 | 
			
				
			 | 
			
			
				-	chroot "$rootdir" apt-get -y install syncthing 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1035
			 | 
			
			
				+	chroot "$rootdir" apt-get -y --force-yes install syncthing 
			 | 
		
	
		
			
			| 
				1038
			 | 
			
				1036
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1039
			 | 
			
				1037
			 | 
			
			
				 	# This probably does need to run as root so that it can access the Sync directories 
			 | 
		
	
		
			
			| 
				1040
			 | 
			
				1038
			 | 
			
			
				 	# in each user's home directory 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1081,7 +1079,7 @@ function configure_user_interface { 
			 | 
		
	
		
			
			| 
				1081
			 | 
			
				1079
			 | 
			
			
				 		# Tox user interface 
			 | 
		
	
		
			
			| 
				1082
			 | 
			
				1080
			 | 
			
			
				 		enable_tox_repo 
			 | 
		
	
		
			
			| 
				1083
			 | 
			
				1081
			 | 
			
			
				 		# TODO: this may not work on all architectures 
			 | 
		
	
		
			
			| 
				1084
			 | 
			
				
			 | 
			
			
				-		chroot "$rootdir" apt-get -y install qtox 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1082
			 | 
			
			
				+		chroot "$rootdir" apt-get -y --force-yes install qtox 
			 | 
		
	
		
			
			| 
				1085
			 | 
			
				1083
			 | 
			
			
				 	fi 
			 | 
		
	
		
			
			| 
				1086
			 | 
			
				1084
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				1087
			 | 
			
				1085
			 | 
			
			
				 	# Syncthing 
			 |