diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index fa4df1dc6..899ae2fa6 100755 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -349,6 +349,8 @@ if [ "${sphinxrelay}" != "${choice}" ]; then anychange=1 sudo -u admin /home/admin/config.scripts/bonus.sphinxrelay.sh ${choice} if [ "${choice}" = "on" ]; then + echo "Giving service 1 minute to start up ... (please wait) ..." + sleep 60 whiptail --title " Installed Sphinx Server" --msgbox "\ Sphinx Server was installed.\n Use the new 'SPHINX' entry in Main Menu for more info.\n diff --git a/home.admin/99systemMenu.sh b/home.admin/99systemMenu.sh index c18ffa7a9..650eb6252 100644 --- a/home.admin/99systemMenu.sh +++ b/home.admin/99systemMenu.sh @@ -45,7 +45,8 @@ case $CHOICE in echo "running: 'sudo tail -n 30 -f /mnt/hdd/${network}/debug.log'" echo echo "Press ENTER to continue" - echo "use CTRL+C any time to abort" + echo "use CTRL+C any time to abort .. then use command 'raspiblitz' to return to menu" + echo "###############################################################################" read key sudo tail -n 30 -f /mnt/hdd/${network}/debug.log;; ${network}CONF) @@ -71,7 +72,8 @@ case $CHOICE in echo "running 'sudo tail -n 30 -f /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log'" echo echo "Press ENTER to continue" - echo "use CTRL+C any time to abort" + echo "use CTRL+C any time to abort .. then use command 'raspiblitz' to return to menu" + echo "###############################################################################" read key sudo tail -n 30 -f /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log;; LNDCONF) @@ -121,11 +123,11 @@ thunderhub, tor@default, tor@lnd, tor read SERVICE echo echo "Will show the logs with:" - echo "'sudo journalctl -n 100 -fu $SERVICE'" + echo "'sudo journalctl -n 10 -fu $SERVICE'" echo - echo "Press ENTER to continue" - echo "use CTRL+C any time to abort" - sudo journalctl -n 100 -fu $SERVICE;; + echo "use CTRL+C any time to abort .. then use command 'raspiblitz' to return to menu" + echo "###############################################################################" + sudo journalctl -n 10 -fu $SERVICE;; CUSTOMRESTART) clear echo @@ -146,9 +148,9 @@ thunderhub, tor@default, tor@lnd, tor sudo systemctl restart $SERVICE echo echo "Will show the logs with:" - echo "'sudo journalctl -n 100 -fu $SERVICE'" + echo "'sudo journalctl -n 10 -fu $SERVICE'" echo - echo "Press ENTER to continue" - echo "use CTRL+C any time to abort" - sudo journalctl -n 100 -fu $SERVICE;; + echo "use CTRL+C any time to abort .. then use command 'raspiblitz' to return to menu" + echo "###############################################################################" + sudo journalctl -n 10 -fu $SERVICE;; esac diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh index a1a63b805..5e17cdbb1 100755 --- a/home.admin/99updateMenu.sh +++ b/home.admin/99updateMenu.sh @@ -281,8 +281,8 @@ WIDTH=55 CHOICE_HEIGHT=3 # 1 line / OPTIONS OPTIONS=( RELEASE "RaspiBlitz Release Update/Recovery" -LND "Interim LND Update Options" PATCH "Patch RaspiBlitz v${codeVersion}" +LND "Interim LND Update Options" ) if [ "${bos}" == "on" ]; then diff --git a/home.admin/config.scripts/blitz.display.sh b/home.admin/config.scripts/blitz.display.sh index 8ce8a61ee..4b00721ba 100755 --- a/home.admin/config.scripts/blitz.display.sh +++ b/home.admin/config.scripts/blitz.display.sh @@ -261,7 +261,7 @@ function install_lcd() { # modify /boot/config.txt sudo sed -i "s/^hdmi_force_hotplug=.*//g" /boot/config.txt - echo "hdmi_force_hotplug=1" >> /boot/config.txt + #echo "hdmi_force_hotplug=1" >> /boot/config.txt sudo sed -i "s/^dtparam=i2c_arm=.*//g" /boot/config.txt # echo "dtparam=i2c_arm=on" >> /boot/config.txt --> this is to be called I2C errors - see: https://github.com/rootzoll/raspiblitz/issues/1058#issuecomment-739517713 # don't enable SPI and UART ports by default @@ -396,7 +396,7 @@ function install_lcd_legacy() { # modify /boot/config.txt sudo sed -i "s/^hdmi_force_hotplug=.*//g" /boot/config.txt - echo "hdmi_force_hotplug=1" >> /boot/config.txt + #echo "hdmi_force_hotplug=1" >> /boot/config.txt sudo sed -i "s/^dtparam=i2c_arm=.*//g" /boot/config.txt echo "dtparam=i2c_arm=on" >> /boot/config.txt # don't enable SPI and UART ports by default diff --git a/home.admin/config.scripts/blitz.touchscreen.sh b/home.admin/config.scripts/blitz.touchscreen.sh index 5cb72fb77..cd0ea5f20 100755 --- a/home.admin/config.scripts/blitz.touchscreen.sh +++ b/home.admin/config.scripts/blitz.touchscreen.sh @@ -213,7 +213,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then # make sure hdmi_force_hotplug=1 is added again to config.txt sudo sed -i '/^hdmi_force_hotplug=/d' /boot/config.txt 2>/dev/null - echo "hdmi_force_hotplug=1" >> /boot/config.txt + #echo "hdmi_force_hotplug=1" >> /boot/config.txt # set user pi user for autostart # TODO(frennkie/rootzoll) what should happen here? This does the same as "on". diff --git a/home.admin/config.scripts/bonus.sphinxrelay.sh b/home.admin/config.scripts/bonus.sphinxrelay.sh index 24d810a98..8f9dd5c22 100755 --- a/home.admin/config.scripts/bonus.sphinxrelay.sh +++ b/home.admin/config.scripts/bonus.sphinxrelay.sh @@ -34,7 +34,7 @@ if [ "$1" = "menu" ]; then whiptail --title " Warning " \ --yes-button "Back" \ --no-button "Continue Anyway" \ - --yesno "Your HTTPS connection over IP2TOR as has problems:\n${ip2torWarn}\n\nCheck if service is reachable over Tor:\n${toraddress}/app\n\nMaybe cancel the IP2Tor & LetsEncrypt subscription & setup fresh." 14 72 + --yesno "Problem detected:\n${ip2torWarn}\n\nCheck if service is reachable over Tor:\n${toraddress}/app" 14 72 if [ "$?" != "1" ]; then exit 0 fi