This commit is contained in:
t3chn0m4g3 2019-02-15 14:11:45 +01:00
parent 1edd768a4b
commit bb3f99c058

View file

@ -196,7 +196,8 @@ fi
#!/bin/bash #!/bin/bash
function fuBANNER { function fuBANNER {
toilet -f ivrit -F metal "$1" | pv -qL 3000 #toilet -f ivrit -F metal "$1" | pv -qL 3000
toilet -f ivrit "$1"
} }
# Prepare running the installer # Prepare running the installer
@ -592,27 +593,27 @@ echo "Port 64295" >> /etc/ssh/sshd_config
# Let's make sure only myCONF_TPOT_FLAVOR images will be downloaded and started # Let's make sure only myCONF_TPOT_FLAVOR images will be downloaded and started
case $myCONF_TPOT_FLAVOR in case $myCONF_TPOT_FLAVOR in
STANDARD) STANDARD)
fuBANNER "STANDARD flavor" fuBANNER "STANDARD"
ln -s /opt/tpot/etc/compose/standard.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/standard.yml $myTPOTCOMPOSE
;; ;;
SENSOR) SENSOR)
fuBANNER "SENSOR flavor" fuBANNER "SENSOR"
ln -s /opt/tpot/etc/compose/sensor.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/sensor.yml $myTPOTCOMPOSE
;; ;;
INDUSTRIAL) INDUSTRIAL)
fuBANNER "INDUSTRIAL flavor" fuBANNER "INDUSTRIAL"
ln -s /opt/tpot/etc/compose/industrial.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/industrial.yml $myTPOTCOMPOSE
;; ;;
COLLECTOR) COLLECTOR)
fuBANNER "COLLECTOR flavor" fuBANNER "COLLECTOR"
ln -s /opt/tpot/etc/compose/collector.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/collector.yml $myTPOTCOMPOSE
;; ;;
NEXTGEN) NEXTGEN)
fuBANNER "NEXTGEN flavor" fuBANNER "NEXTGEN"
ln -s /opt/tpot/etc/compose/nextgen.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/nextgen.yml $myTPOTCOMPOSE
;; ;;
LEGACY) LEGACY)
fuBANNER "LEGACY flavor" fuBANNER "LEGACY"
ln -s /opt/tpot/etc/compose/legacy.yml $myTPOTCOMPOSE ln -s /opt/tpot/etc/compose/legacy.yml $myTPOTCOMPOSE
;; ;;
esac esac
@ -801,7 +802,8 @@ if [ "$myTPOT_DEPLOYMENT_TYPE" == "auto" ];
then then
echo "Done. Please reboot." echo "Done. Please reboot."
else else
dialog --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Thanks for your patience. Now rebooting. ]" --pause "" 6 80 2 && \ reset
dialog --clear --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Thanks for your patience. Now rebooting. ]" --pause "" 6 80 2 && \
systemctl restart console-setup.service systemctl restart console-setup.service
dialog --clear dialog --clear
reboot reboot