v9.5

- DietPi-Config | Detect as well UART devices with indices above 9. The Raspberry Pi 5 has a ttyAMA10
MichaIng · May 25, 2024 · 1f32880 · 1f32880
1 parent 457ae23
commit 1f32880
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dietpi/dietpi-config b/dietpi/dietpi-config
@@ -944,7 +944,7 @@ Re-enabling HDMI requires a reboot. If you need emergency HDMI output, edit the
 		G_WHIP_MENU_ARRAY=()
 
 		(( $G_HW_MODEL < 10 )) && G_WHIP_MENU_ARRAY+=('' '●─ Toggle console ')
-		for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]
+		for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]*
 		do
 			[[ -e $i ]] || continue
 			i=${i#/dev/}

diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware
@@ -1503,7 +1503,7 @@ Do you want to continue and disable the serial login console?' || return 1
 
 				# Enable boot messages depending on device
 				# - Skip on USB getget serial device, which requires loading a kernel module first and hence cannot be used for boot outputs
-				if [[ $INPUT_ADDITIONAL == 'ttyGS'[0-9] ]]
+				if [[ $INPUT_ADDITIONAL == 'ttyGS'[0-9]* ]]
 				then
 					:
 
@@ -1567,7 +1567,7 @@ _EOF_
 
 			# Enable for all detected Serial/UART devices
 			else
-				for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]
+				for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]*
 				do
 					[[ -e $i ]] || continue
 					INPUT_ADDITIONAL=${i/\/dev\/} Serial_Main
@@ -1629,7 +1629,7 @@ _EOF_
 
 			# Disable for all detected Serial/UART devices
 			else
-				for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]
+				for i in /dev/{tty{S,AMA,SAC,AML,SC,GS,FIQ,MV},hvc}[0-9]*
 				do
 					[[ -e $i ]] || continue
 					INPUT_ADDITIONAL=${i/\/dev\/} Serial_Main