From acb9aa4fd27bc96d4937aa7ffd1c27047ad96e36 Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Mon, 29 Oct 2018 17:05:02 +0000 Subject: [PATCH] no reboot in auto or user mode --- iso/installer/install.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 0586e9de..6a7dcccf 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -134,7 +134,7 @@ apt-get -y update echo echo "### Upgrading packages." echo -# Downlaod and upgrade packages, but silently kee existing configs +# Downlaod and upgrade packages, but silently keep existing configs apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes echo echo "### Installing T-Pot dependencies." @@ -755,5 +755,10 @@ apt-get autoremove -y 2>&1 | dialog --title "[ Cleaning up ]" $myPROGRESSBOXCONF # Final steps cp /opt/tpot/host/etc/rc.local /etc/rc.local 2>&1>/dev/null && \ rm -rf /root/installer 2>&1>/dev/null && \ -dialog --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Thanks for your patience. Now rebooting. ]" --pause "" 6 80 2 && \ -reboot +if [ "$myTPOT_DEPLOYMENT_TYPE" == "auto" ]; + then + echo "Done. Please reboot." + else + dialog --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Thanks for your patience. Now rebooting. ]" --pause "" 6 80 2 && \ + reboot +fi