|
@@ -242,7 +242,7 @@ create_generic_image() {
|
242
|
242
|
fi
|
243
|
243
|
|
244
|
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
|
246
|
CONFIG_FILENAME=
|
247
|
247
|
else
|
248
|
248
|
touch $rootdir/root/.initial_mesh_setup
|
|
@@ -319,7 +319,7 @@ EOF
|
319
|
319
|
echo " git pull" >> $rootdir/root/.bashrc
|
320
|
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
|
323
|
if [[ $ONION_ONLY == "no" ]]; then
|
324
|
324
|
if [[ $MINIMAL_INSTALL == "no" ]]; then
|
325
|
325
|
echo " ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc
|
|
@@ -340,7 +340,7 @@ EOF
|
340
|
340
|
echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
|
341
|
341
|
echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc
|
342
|
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
|
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
|
345
|
echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
|
346
|
346
|
else
|
|
@@ -400,7 +400,7 @@ atheros_wifi() {
|
400
|
400
|
}
|
401
|
401
|
|
402
|
402
|
configure_wifi() {
|
403
|
|
- if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" ]]; then
|
|
403
|
+ if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
|
404
|
404
|
return
|
405
|
405
|
fi
|
406
|
406
|
|
|
@@ -956,7 +956,7 @@ function mesh_zeronet {
|
956
|
956
|
}
|
957
|
957
|
|
958
|
958
|
initialise_mesh() {
|
959
|
|
- if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" ]]; then
|
|
959
|
+ if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
|
960
|
960
|
return
|
961
|
961
|
fi
|
962
|
962
|
if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
|
|
@@ -1044,7 +1044,7 @@ function install_syncthing {
|
1044
|
1044
|
}
|
1045
|
1045
|
|
1046
|
1046
|
function configure_user_interface {
|
1047
|
|
- if [[ $VARIANT != "meshclient" && $VARIANT != "usb" ]]; then
|
|
1047
|
+ if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
|
1048
|
1048
|
return
|
1049
|
1049
|
fi
|
1050
|
1050
|
|