Beta v6.31.1 (#3639)

.meta/dietpi-survey_report

@@ -453,6 +453,7 @@
 		aSOFTWARE_NAME6_31[$i]=${aSOFTWARE_NAME6_30[$i]}
 
 	done
+	aSOFTWARE_NAME6_31[177]='Firefox Sync Server'
 
 	Main(){
 
@@ -819,8 +820,8 @@
 			<tr>
 				<td colspan="2"/>
 				<td colspan="3" bgcolor="#5B5B5B">CPU time (seconds, lower is faster):</td>
-				<td colspan="3" bgcolor="#5B5B5B">CPU idle temp (°C):</td>
-				<td colspan="3" bgcolor="#5B5B5B">CPU full load temp (°C):</td>
+				<td colspan="3" bgcolor="#5B5B5B">CPU idle temp (&#176;C):</td>
+				<td colspan="3" bgcolor="#5B5B5B">CPU full load temp (&#176;C):</td>
 			</tr>
 			<tr>
 				<td bgcolor="#5B5B5B">Device:</td>

BRANCH_SYSTEM.md

@@ -15,7 +15,7 @@ Beta on an existing installation:
 1. Recommended: Backup your system with ```dietpi-backup``` (or backup quickly with ```dietpi-backup 1```)
 2. Run the following command to switch to 'beta' branch:
 ```
-G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=beta' /DietPi/dietpi.txt
+G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=beta' /boot/dietpi.txt
 ```
 3. Run ```dietpi-update``` to update the system, then reboot.
 4. Test away, please report any issues on our GitHub page. Also ensure you mention "Beta branch" in your post: https://github.com/MichaIng/DietPi/issues

CHANGELOG.txt

@@ -1,5 +1,5 @@
 v6.31
-(XX/06/20)
+(05/06/20)
 
 Changes / Improvements / Optimisations:
 - RPi | Support for Raspberry Pi OS (64-bit) has been added, including any other Debian pre-image on RPi. Many thanks to @FusionPlmH for doing this request: https://github.com/MichaIng/DietPi/issues/3570
@@ -16,11 +16,15 @@ Changes / Improvements / Optimisations:
 - DietPi-Software | Sonarr/Radarr/Lidarr: The /media directory as second common mount point can now also be used as download/media directory without manually adding it to the systemd units ReadWritePaths list. Many thanks to @ricardoandren for doing this suggestion: https://github.com/MichaIng/DietPi/issues/3561
 - DietPi-Software | Samba Server: Changed default server-side file permissions from 0775 to 0664, hence files on the server are by default created without execute permissions now, which suits usual standards. Many thanks to @maartenlangeveld for doing this suggestion: https://github.com/MichaIng/DietPi/issues/3581
 - DietPi-Software | QuiteRSS: Re-added the years ago accidentally removed install code block. If you ever wondered why there was no QuiteRSS after selecting it for install, now there will be. If it is marked as installed already, run either "dietpi-software install 22" or simply "apt install quiterss" to (really) get it.
+- DietPi-Software | SqueezeLite: Updated to v1.9.7 and the service runs now as own user "squeezelite". Many thanks to @volpone for doing the update request: https://github.com/MichaIng/DietPi/issues/2386
 
 Bug Fixes:
 - System | Resolved potential issues due to missing /media directory on DietPi images, which is not used by default but is part of FHS and can hence be expected by Linux software, e.g. htpdate. Many thanks to @jokoren for reporting this issue: https://github.com/MichaIng/DietPi/issues/3558
 - DietPi-Login | Resolved an issue where the script called itself from within the error handler subshell. Generally the error handler subshell must never call dietpi-login (and related autostart programs) and dietpi-login must never call itself from an interactive subshell. Many thanks to @nosyaardvark for reporting this issue: https://github.com/MichaIng/DietPi/issues/3583#issuecomment-643583664
 - DietPi-Drive_Manager | Resolved an issue where moving the RootFS to an external drive did not include DietPi userdata. Many thanks to @sdomotica and @Joulinar for reporting this issue: https://github.com/MichaIng/DietPi/issues/3600#issuecomment-643261670
+- DietPi-LED_control | Resolved an issue where LED triggers fail to become boot persistent. Many thanks to @FrostyMisa for reporting this issue: https://github.com/MichaIng/DietPi/issues/3636
+- DietPi-Config | Resolved an issue on RPi3+ models where RPi3 non-plus overclocking profiles were shown. Many thanks to @lone for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=9&t=7804
+- DietPi-Config | Resolved an issue on RPi4 2/4/8 GiB RAM models where the current GPU memory split was not obtained correctly. Many thanks to @FrostyMisa for reporting this issue: https://github.com/MichaIng/DietPi/issues/3636#issuecomment-652467249
 - DietPi-Software | Logging choice: Resolved an issue where manually choosing logging options "None" and "Full" during firstrun installs did not uninstall DietPi-RAMlog as intended. Many thanks to @Pain-Patate for reporting this issue: https://github.com/MichaIng/DietPi/issues/3588
 - DietPi-Software | GMediaRender+WireGuard: Resolved an issue where service start could have failed due to invalid network information. Many thanks to @fnsnyc for reporting this issue: https://github.com/MichaIng/DietPi/issues/3519
 - DietPi-Software | rTorrent: Resolved an issue where startup fails because of invalid default config values. Many thanks to @PiTech and @vorrac for reporting and fixing this issue: https://dietpi.com/phpbb/viewtopic.php?f=15&t=7613, https://dietpi.com/phpbb/viewtopic.php?f=11&t=7607
@@ -32,7 +36,7 @@ Bug Fixes:
 - DietPi-Software | TigerVNC: Worked around an external bug where the VNC server crashed after client logout or failed to start at all. Many thanks to @Joulinar for investigating this issue and providing the workaround: https://dietpi.com/phpbb/viewtopic.php?p=25285#p25285
 - DietPi-Software | XRDP: The above TigerVNC bug affected as well XRDP connections which have been resolved in the same turn: https://github.com/MichaIng/DietPi/issues/3615#issuecomment-650559035
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/3640
 
 Known/Outstanding Issues:
 - DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103

dietpi/dietpi-config

@@ -151,14 +151,14 @@
 		G_WHIP_SIZE_X_MAX=50
 		if G_WHIP_YESNO "Exit $G_PROGRAM_NAME?"; then
 
-			TARGETMENUID=-1
-
 			# Disable reboot when run from dietpi-software
 			pgrep 'dietpi-software' &> /dev/null && REBOOT_REQUIRED=0
 
 			# Reboot required
 			(( $REBOOT_REQUIRED )) && G_WHIP_YESNO 'A reboot is required to apply your new settings.\nWould you like to reboot now?' && reboot
 
+			TARGETMENUID=-1
+
 		# Return to DietPi-Config main menu
 		elif (( ! $EXITONBACK )); then
 
@@ -2034,26 +2034,20 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 	# TARGETMENUID=6
 	Menu_GpumemoryOptions(){
 
-		TARGETMENUID=1
-
-		# Get current and/or total (depends on board) mem split settings
-		local gpu_mem_current=0
-		local ram_mem_current=$(free -m | mawk '/Mem:/{print $2;exit}')
-
-		if (( $G_HW_MODEL < 10 )); then
-
-			gpu_mem_current=$(sed -n "/^[[:blank:]]*gpu_mem_$G_HW_MEMORY_SIZE=/{s/^[^=]*=//p;q}" /boot/config.txt)
-			ram_mem_current=$((G_HW_MEMORY_SIZE-gpu_mem_current))
-
-		elif (( $G_HW_MODEL == 12 )); then
-
-			gpu_mem_current=$((2048-ram_mem_current))
-
-		fi
+		TARGETMENUID=1 # Return to Display Options
 
 		# RPi
 		if (( $G_HW_MODEL < 10 )); then
 
+			# Get current memory split
+			# - Get override setting: gpu_mem_1024 is effective for all models with >= 1 GiB
+			local value=$G_HW_MEMORY_SIZE
+			(( $value <= 1024 )) || value=1024
+			local gpu_mem_current=$(sed -n "/^[[:blank:]]*gpu_mem_$value=/{s/^[^=]*=//p;q}" /boot/config.txt) # override setting
+			[[ $gpu_mem_current ]] || gpu_mem_current=$(sed -n "/^[[:blank:]]*gpu_mem=/{s/^[^=]*=//p;q}" /boot/config.txt) # base setting
+			[[ $gpu_mem_current ]] || gpu_mem_current=64 # default value
+			local ram_mem_current=$((G_HW_MEMORY_SIZE-gpu_mem_current))
+
 			# Create array for storing menu selectable options.
 			G_WHIP_MENU_ARRAY=(
 
@@ -2079,36 +2073,36 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 			fi
 
 			G_WHIP_DEFAULT_ITEM=$gpu_mem_current
-			if G_WHIP_MENU "Hardware : $G_HW_MODEL_NAME\nCurrent: $gpu_mem_current MB GPU | $ram_mem_current MB RAM"; then
+			if G_WHIP_MENU "Hardware : $G_HW_MODEL_NAME\nCurrent: $gpu_mem_current MiB GPU | $ram_mem_current MiB RAM"; then
 
+				TARGETMENUID=6 # Return to this menu
 				/boot/dietpi/func/dietpi-set_hardware gpumemsplit $G_WHIP_RETURNED_VALUE
 				REBOOT_REQUIRED=1
 
-				TARGETMENUID=6 # Return to this menu
-
 			fi
 
 		# Odroid C2
 		elif (( $G_HW_MODEL == 12 )); then
 
-			# Odroid HDMI/headless extra data
+			# Get current memory split
+			local ram_mem_current=$(free -m | mawk '/Mem:/{print $2;exit}')
+			local gpu_mem_current=$((2048-ram_mem_current))
+
+			# HDMI/headless extra data
 			local display_output_enabled=$(grep -cm1 '^[[:blank:]]*setenv nographics "0"' /boot/boot.ini)
 			local display_output_text='On'
 			(( $display_output_enabled )) || display_output_text='Off'
 
 			G_WHIP_MENU_ARRAY=(
 
-				'Headless' ': HDMI: Disabled | VPU: Disabled | +300MB RAM'
-				'Default' ': HDMI: Enabled  | VPU: Enabled | -300MB RAM'
+				'Headless' ': HDMI: Disabled | VPU: Disabled | +300 MiB RAM'
+				'Default' ': HDMI: Enabled  | VPU: Enabled | -300 MiB RAM'
 
 			)
 
-			if G_WHIP_MENU "Hardware : $G_HW_MODEL_NAME\nCurrent  : HDMI: [$display_output_text] | VPU: [$display_output_text]\nMemory   : $gpu_mem_current MB GPU | $ram_mem_current MB RAM\nNB: GPU/RAM figures require a reboot after a change is made."; then
-
-				REBOOT_REQUIRED=1
+			if G_WHIP_MENU "Hardware : $G_HW_MODEL_NAME\nCurrent  : HDMI: [$display_output_text] | VPU: [$display_output_text]\nMemory   : $gpu_mem_current MiB GPU | $ram_mem_current MiB RAM\nNB: GPU/RAM figures require a reboot after a change is made."; then
 
 				TARGETMENUID=6 # Return to this menu
-
 				case "$G_WHIP_RETURNED_VALUE" in
 
 					'Headless')
@@ -2124,6 +2118,7 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 					;;
 
 				esac
+				REBOOT_REQUIRED=1
 
 			fi
 
@@ -3560,16 +3555,16 @@ Additional benchmarks:
 
 		elif (( $G_HW_MODEL == 3 )); then
 
-			if [[ $G_HW_MODEL_NAME == *'+' ]]; then
+			sed -i '/core_freq=/c\#core_freq=400' /boot/config.txt
+
+			if [[ $G_HW_MODEL_NAME == *'+'* ]]; then
 
 				sed -i '/arm_freq=/c\#arm_freq=1400' /boot/config.txt
-				sed -i '/core_freq=/c\#core_freq=400' /boot/config.txt
 				sed -i '/sdram_freq=/c\#sdram_freq=500' /boot/config.txt
 
 			else
 
 				sed -i '/arm_freq=/c\#arm_freq=1200' /boot/config.txt
-				sed -i '/core_freq=/c\#core_freq=400' /boot/config.txt
 				sed -i '/sdram_freq=/c\#sdram_freq=450' /boot/config.txt
 
 			fi
@@ -3771,7 +3766,7 @@ Additional benchmarks:
 		# Overclocking Pi3
 		elif (( $G_HW_MODEL == 3 )); then
 
-			if [[ $G_HW_MODEL_NAME == *'+' ]]; then
+			if [[ $G_HW_MODEL_NAME == *'+'* ]]; then
 
 				G_WHIP_MENU_ARRAY=('none' ': 1400 MHz ARM | 400 MHz core | 500 MHz SDRAM | 0 overvolt')
 
@@ -4537,10 +4532,10 @@ NB: If you need to use *.pool.ntp.org servers, enter the base domain only. The s
 	}
 
 	PROXY_ENABLED=0
-	PROXY_ADDRESS=''
-	PROXY_PORT=''
-	PROXY_USERNAME=''
-	PROXY_PASSWORD=''
+	PROXY_ADDRESS=
+	PROXY_PORT=
+	PROXY_USERNAME=
+	PROXY_PASSWORD=
 
 	# So we can call this in other menus (eg: submenu of this)
 	Load_Proxy_Vars(){

dietpi/dietpi-led_control

@@ -45,20 +45,14 @@
 			aTRIGGER_CURRENT[$i]=${aTRIGGERS_AVAILABLE[$i]##*[}
 			aTRIGGER_CURRENT[$i]=${aTRIGGER_CURRENT[$i]%%]*}
 			aTRIGGERS_AVAILABLE[$i]=${aTRIGGERS_AVAILABLE[$i]//[][]}
-			if [[ -f $FP_UDEV_RULES && $(<$FP_UDEV_RULES) == *KERNEL==\"${aNAME[$i]}\"* ]]; then
-
-				aTRIGGER_SELECTED[$i]=$(sed -n "/KERNEL==\"${aNAME[$i]}\"/{s/^.*ATTR{trigger}=\"//;s/\".*$//p;q}" $FP_UDEV_RULES)
-
-			fi
+			[[ -f $FP_UDEV_RULES && $(<$FP_UDEV_RULES) == *KERNEL==\"${aNAME[$i]}\"* ]] || continue
+			aTRIGGER_SELECTED[$i]=$(sed -n "/KERNEL==\"${aNAME[$i]}\"/{s/^.*ATTR{trigger}=\"//;s/\".*$//p;q}" $FP_UDEV_RULES)
 
 		done
 
-		if (( $i == 0 )); then
-
-			G_DIETPI-NOTIFY 1 'No LED devices found in /sys/class/leds/. Exiting...'
-			TARGETMENUID=-1 # Exit
-
-		fi
+		(( $i == 0 )) || return
+		G_DIETPI-NOTIFY 1 'No LED devices found in /sys/class/leds/. Exiting...'
+		TARGETMENUID=-1 # Exit
 
 	}
 
@@ -90,7 +84,7 @@
 
 			[[ ! -f $FP_UDEV_RULES ]] || G_EXEC_NOHALT=1 G_EXEC rm $FP_UDEV_RULES || return 1
 			aTRIGGER_SELECTED=()
-			G_WHIP_MSG 'All LED triggers have been reset to system defaults.\n\nThis will become active from next reboot.'
+			G_WHIP_MSG 'All LED triggers have been reset to system defaults.\n\nThis will take effect from the next restart.'
 
 		else
 
@@ -133,7 +127,7 @@
 			G_DIETPI-NOTIFY 2 "Applying trigger \e[33m$G_WHIP_RETURNED_VALUE\e[90m to LED \e[33m${aNAME[$SELECTED_LED]}"
 			echo "$G_WHIP_RETURNED_VALUE" > "/sys/class/leds/${aNAME[$SELECTED_LED]}/trigger" || return 1
 			aTRIGGER_CURRENT[$SELECTED_LED]=$G_WHIP_RETURNED_VALUE
-			[[ -f $FP_UDEV_RULES ]] || G_EXEC_NOHALT=1 G_EXEC $FP_UDEV_RULES || return 1
+			[[ -f $FP_UDEV_RULES ]] || G_EXEC_NOHALT=1 G_EXEC touch $FP_UDEV_RULES || return 1
 			G_CONFIG_INJECT "SUBSYSTEM==\"leds\", KERNEL==\"${aNAME[$SELECTED_LED]}\"" "SUBSYSTEM==\"leds\", KERNEL==\"${aNAME[$SELECTED_LED]}\", ACTION==\"add\", ATTR{trigger}=\"${aTRIGGER_CURRENT[$SELECTED_LED]}\"" $FP_UDEV_RULES
 			aTRIGGER_SELECTED[$SELECTED_LED]=aTRIGGER_CURRENT[$SELECTED_LED]