|
|
|
|
285
|
}
|
285
|
}
|
286
|
|
286
|
|
287
|
configure_ssh() {
|
287
|
configure_ssh() {
|
288
|
- if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
|
|
|
|
|
288
|
+ if [[ $VARIANT == "mesh"* ]]; then
|
289
|
return
|
289
|
return
|
290
|
fi
|
290
|
fi
|
291
|
|
291
|
|
|
|
|
|
320
|
fi
|
320
|
fi
|
321
|
|
321
|
|
322
|
# Don't install any configuration. This will be a base system
|
322
|
# Don't install any configuration. This will be a base system
|
323
|
- if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
|
|
|
|
|
323
|
+ if [[ $VARIANT != "mesh"* ]]; then
|
324
|
CONFIG_FILENAME=
|
324
|
CONFIG_FILENAME=
|
325
|
else
|
325
|
else
|
326
|
touch $rootdir/root/.initial_mesh_setup
|
326
|
touch $rootdir/root/.initial_mesh_setup
|
|
|
|
|
403
|
echo " git checkout stretch" >> $rootdir/root/.bashrc
|
403
|
echo " git checkout stretch" >> $rootdir/root/.bashrc
|
404
|
echo " make install" >> $rootdir/root/.bashrc
|
404
|
echo " make install" >> $rootdir/root/.bashrc
|
405
|
|
405
|
|
406
|
- if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
|
|
|
|
|
406
|
+ if [[ $VARIANT != "mesh"* && $VARIANT != "usb" ]]; then
|
407
|
if [[ "$SOCIALINSTANCE" == "gnusocial" ]]; then
|
407
|
if [[ "$SOCIALINSTANCE" == "gnusocial" ]]; then
|
408
|
echo " ${PROJECT_NAME} menuconfig-gnusocial" >> $rootdir/root/.bashrc
|
408
|
echo " ${PROJECT_NAME} menuconfig-gnusocial" >> $rootdir/root/.bashrc
|
409
|
else
|
409
|
else
|
|
|
|
|
433
|
echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
|
433
|
echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
|
434
|
echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
|
434
|
echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
|
435
|
echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc
|
435
|
echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc
|
436
|
- if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
|
|
|
|
|
436
|
+ if [[ $VARIANT != "mesh"* && $VARIANT != "usb" ]]; then
|
437
|
echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
|
437
|
echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
|
438
|
|
438
|
|
439
|
echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
|
439
|
echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
|
|
|
|
|
583
|
INSTALLING_MESH=
|
583
|
INSTALLING_MESH=
|
584
|
|
584
|
|
585
|
initialise_mesh() {
|
585
|
initialise_mesh() {
|
586
|
- if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
|
|
|
|
|
586
|
+ if [[ $VARIANT != "mesh"* ]]; then
|
587
|
return
|
587
|
return
|
588
|
fi
|
588
|
fi
|
589
|
if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
|
589
|
if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
|
|
|
|
|
1236
|
}
|
1236
|
}
|
1237
|
|
1237
|
|
1238
|
function image_preinstall_repos {
|
1238
|
function image_preinstall_repos {
|
|
|
1239
|
+ if [[ $VARIANT == "mesh"* ]]; then
|
|
|
1240
|
+ return
|
|
|
1241
|
+ fi
|
|
|
1242
|
+
|
1239
|
if [ ! -d $rootdir/repos ]; then
|
1243
|
if [ ! -d $rootdir/repos ]; then
|
1240
|
mkdir $rootdir/repos
|
1244
|
mkdir $rootdir/repos
|
1241
|
fi
|
1245
|
fi
|
|
|
|
|
1364
|
chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)"
|
1368
|
chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)"
|
1365
|
fi
|
1369
|
fi
|
1366
|
|
1370
|
|
1367
|
-if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "mesh" ]]; then
|
|
|
|
|
1371
|
+if [[ $VARIANT != "mesh"* ]]; then
|
1368
|
chroot "$rootdir" apt-get install -y openssh-server
|
1372
|
chroot "$rootdir" apt-get install -y openssh-server
|
1369
|
fi
|
1373
|
fi
|
1370
|
chroot "$rootdir" apt-get install -y sudo git dialog build-essential
|
1374
|
chroot "$rootdir" apt-get install -y sudo git dialog build-essential
|