#2066 small fixes for apps, updates & lcd (#2200)

This commit is contained in:
/rootzoll 2021-04-18 22:58:48 +02:00 committed by GitHub
parent a82c15fe88
commit ea51b58301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 15 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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".

View file

@ -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