Parcourir la source

meshusb variant

Bob Mottram il y a 8 ans
Parent
révision
201d2cb0ca
2 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. BIN
      man/freedombone-image.1.gz
  2. 6
    6
      src/freedombone-image-customise

BIN
man/freedombone-image.1.gz Voir le fichier


+ 6
- 6
src/freedombone-image-customise Voir le fichier

242
 	fi
242
 	fi
243
 
243
 
244
 	# Don't install any configuration. This will be a base system
244
 	# Don't install any configuration. This will be a base system
245
-	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" ]]; then
245
+	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
246
 		CONFIG_FILENAME=
246
 		CONFIG_FILENAME=
247
 	else
247
 	else
248
 		touch $rootdir/root/.initial_mesh_setup
248
 		touch $rootdir/root/.initial_mesh_setup
319
 	echo "    git pull" >> $rootdir/root/.bashrc
319
 	echo "    git pull" >> $rootdir/root/.bashrc
320
 	echo "    make install" >> $rootdir/root/.bashrc
320
 	echo "    make install" >> $rootdir/root/.bashrc
321
 
321
 
322
-	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "usb" ]]; then
322
+	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
323
 		if [[ $ONION_ONLY == "no" ]]; then
323
 		if [[ $ONION_ONLY == "no" ]]; then
324
 			if [[ $MINIMAL_INSTALL == "no" ]]; then
324
 			if [[ $MINIMAL_INSTALL == "no" ]]; then
325
 				echo "    ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc
325
 				echo "    ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc
340
 	echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
340
 	echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
341
 	echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
341
 	echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
342
 	END_MESSAGE1=$'Congratulations!'
342
 	END_MESSAGE1=$'Congratulations!'
343
-	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "usb" ]]; then
343
+	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
344
 		END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at $SSH_ONION_HOSTNAME\n\nPress any key to reboot and begin using it'
344
 		END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at $SSH_ONION_HOSTNAME\n\nPress any key to reboot and begin using it'
345
 		echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
345
 		echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
346
 	else
346
 	else
400
 }
400
 }
401
 
401
 
402
 configure_wifi() {
402
 configure_wifi() {
403
-	if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" ]]; then
403
+	if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
404
 		return
404
 		return
405
 	fi
405
 	fi
406
 
406
 
956
 }
956
 }
957
 
957
 
958
 initialise_mesh() {
958
 initialise_mesh() {
959
-	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" ]]; then
959
+	if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
960
 		return
960
 		return
961
 	fi
961
 	fi
962
 	if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
962
 	if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
1044
 }
1044
 }
1045
 
1045
 
1046
 function configure_user_interface {
1046
 function configure_user_interface {
1047
-	if [[ $VARIANT != "meshclient" && $VARIANT != "usb" ]]; then
1047
+	if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
1048
 		return
1048
 		return
1049
 	fi
1049
 	fi
1050
 
1050