Skip to content

Commit 528bf2f

Browse files
committed
Raspberry Pi: enable primary UART by default
It is unintentionally disabled for first boot, in which case enabled bootloader and kernel output there cannot work, and the related prompt whether to disable the serial console makes no sense, as it was not usable anyway. Additionally: ci: dietpi-software test: fix Tor port being TCP
1 parent a8a6cf6 commit 528bf2f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.build/images/dietpi-installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,7 @@ _EOF_'
20612061
# On RPi the primary serial console depends on model, use "serial0" which links to the primary console, converts to correct device on first boot
20622062
if (( $G_HW_MODEL < 10 ))
20632063
then
2064-
G_CONFIG_INJECT 'enable_uart=' 'enable_uart=0' /boot/config.txt
2064+
G_CONFIG_INJECT 'enable_uart=' 'enable_uart=1' /boot/config.txt
20652065
/boot/dietpi/func/dietpi-set_hardware serialconsole enable serial0
20662066
# Disable and mask the others explicitly to be independent of currently available serial devices
20672067
/boot/dietpi/func/dietpi-set_hardware serialconsole disable ttyAMA0

.github/workflows/dietpi-software.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Process_Software()
126126
58) aCOMMANDS[i]='tailscale version';; # aSERVICES[i]='tailscaled' aUDP[i]='41641' GitHub Actions runners do not support the TUN module
127127
59) aSERVICES[i]='raspimjpeg';;
128128
60) aCOMMANDS[i]='iptables -V' aSERVICES[i]='isc-dhcp-server' aUDP[i]='67';; # aSERVICES[i]='hostapd' fails without actual WiFi interface
129-
61) aSERVICES[i]='tor' aUDP[i]='53 9040';;
129+
61) aSERVICES[i]='tor' aTCP[i]='9040' aUDP[i]='53';;
130130
62) aCOMMANDS[i]='box86 -v';;
131131
65) aSERVICES[i]='netdata' aTCP[i]='19999';;
132132
66) aSERVICES[i]='rpimonitor' aTCP[i]='8888';;

0 commit comments

Comments
 (0)