From c7fd2a9b6904e2a531423311ad56ea1ddfb21034 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 00:26:56 +0200
Subject: [PATCH 01/13] v6.31

+ CHANGELOG | Fix release date
---
 CHANGELOG.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9e25ef48d4..67ca1020ec 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,5 @@
 v6.31
-(05/06/20)
+(05/07/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

From dc832f2c148983d18efee798a1df784a30bf201d Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 15:55:19 +0200
Subject: [PATCH 02/13] v6.31

+ DietPi-LED_control | Tiny consistency
---
 dietpi/dietpi-led_control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-led_control b/dietpi/dietpi-led_control
index 7912f2fe34..62fd5e3158 100644
--- a/dietpi/dietpi-led_control
+++ b/dietpi/dietpi-led_control
@@ -17,7 +17,7 @@
 
 	# Import DietPi-Globals --------------------------------------------------------------
 	. /boot/dietpi/func/dietpi-globals
-	G_PROGRAM_NAME='DietPi-LED_Control'
+	G_PROGRAM_NAME='DietPi-LED_control'
 	G_CHECK_ROOT_USER
 	G_CHECK_ROOTFS_RW
 	G_INIT

From 4e173d79778e945f26c5383f9d3c539db260c004 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 15:56:23 +0200
Subject: [PATCH 03/13] v6.31

+ DietPi-Launcher | Add DietPi-LED_control; Silence shellcheck about "read" without "-r" even that here we do not actually parse input
---
 dietpi/dietpi-launcher | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-launcher b/dietpi/dietpi-launcher
index 39af184f43..0347f313c6 100644
--- a/dietpi/dietpi-launcher
+++ b/dietpi/dietpi-launcher
@@ -10,7 +10,7 @@
 	#
 	# Info:
 	# - Location: /boot/dietpi/dietpi-launcher
-	# - Whiptail menu with list of all DietPi programs etc.
+	# - Whiptail menu with list of most DietPi programs
 	#
 	#////////////////////////////////////
 	# Import DietPi-Globals --------------------------------------------------------------
@@ -35,6 +35,7 @@
 			'DietPi-Drive_Manager' ': Setup and control multiple external drives'
 			'DietPi-AutoStart' ': Choose what software runs after boot'
 			'DietPi-Services' ': Service and process tool control'
+			'DietPi-LED_control' ': Adjust board LED triggers'
 			'DietPi-Cron' ': Modify the start times of cron jobs'
 			'DietPi-JustBoom' ': Launch EQ and MPD audio options menu'
 
@@ -95,13 +96,13 @@
 			else
 
 				G_DIETPI-NOTIFY 1 "The chosen program $G_WHIP_RETURNED_VALUE could not be found on your system."
-				read -p " - Press any key to return to $G_PROGRAM_NAME..."
+				read -rp " - Press any key to return to $G_PROGRAM_NAME..."
 				return
 
 			fi
 
 			# + Wait for user input
-			[[ $? != 0 || $command == 'dietpi-cpuinfo' || $command == 'dietpi-update' || $command == 'dietpi-morsecode' ]] && read -p "
+			[[ $? != 0 || $command == 'dietpi-cpuinfo' || $command == 'dietpi-update' || $command == 'dietpi-morsecode' ]] && read -rp "
 - Press any key to return to $G_PROGRAM_NAME..."
 
 		else

From 3f63e4d7497fd4dcae62a530bd2b2e3425a9db81 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 16:34:30 +0200
Subject: [PATCH 04/13] v6.31 (#3644)

+ Coding | https://github.com/koalaman/shellcheck/wiki/SC2162: Since we do not scrape input but only hand to hold script execution via "-p", "-r" has no affect. But lets mute spellcheck.
+ Coding | https://github.com/koalaman/shellcheck/wiki/SC1087: Since we do not want to expand an array use square brackets for regex matching, curtly braces are not required. But lets mute spellcheck.
---
 dietpi/dietpi-cleaner                                | 2 +-
 dietpi/dietpi-cloudshell                             | 2 +-
 dietpi/dietpi-config                                 | 4 ++--
 dietpi/dietpi-drive_manager                          | 8 ++++----
 dietpi/dietpi-letsencrypt                            | 9 ++-------
 dietpi/dietpi-software                               | 2 +-
 dietpi/dietpi-update                                 | 2 +-
 dietpi/func/dietpi-globals                           | 8 ++++----
 dietpi/func/dietpi-set_hardware                      | 4 ++--
 dietpi/func/dietpi-set_software                      | 2 +-
 dietpi/misc/dietpi-justboom                          | 2 +-
 rootfs/etc/bashrc.d/dietpi.bash                      | 2 +-
 rootfs/var/lib/dietpi/services/dietpi-firstboot.bash | 2 +-
 13 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/dietpi/dietpi-cleaner b/dietpi/dietpi-cleaner
index 45d01efcbd..26d482e18f 100644
--- a/dietpi/dietpi-cleaner
+++ b/dietpi/dietpi-cleaner
@@ -342,7 +342,7 @@ Would you like to continue and start the cleaning process?" && Run_Cleaners
 
 		if (( $DRY_RUN )); then
 
-			read -p "
+			read -rp "
 $G_PROGRAM_NAME simulation has finished: Press any key to continue..."
 
 		else
diff --git a/dietpi/dietpi-cloudshell b/dietpi/dietpi-cloudshell
index bd02b3600c..0c27463b91 100644
--- a/dietpi/dietpi-cloudshell
+++ b/dietpi/dietpi-cloudshell
@@ -1256,7 +1256,7 @@ _EOF_
 
 			clear
 			echo -e "$C_RESET"
-			read -p "Use CTRL+C to exit. Press any key to launch $G_PROGRAM_NAME..."
+			read -rp "Use CTRL+C to exit. Press any key to launch $G_PROGRAM_NAME..."
 
 			Run_Cloudshell
 
diff --git a/dietpi/dietpi-config b/dietpi/dietpi-config
index 0e3b4a3e2f..bfdaf75d9d 100644
--- a/dietpi/dietpi-config
+++ b/dietpi/dietpi-config
@@ -1988,7 +1988,7 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 
 			else
 
-				read -p 'Press any key to return to DietPi-Config...'
+				read -rp 'Press any key to return to DietPi-Config...'
 
 			fi
 
@@ -4507,7 +4507,7 @@ NB: If you need to use *.pool.ntp.org servers, enter the base domain only. The s
 						# Failsafe: Directory required for "noip2 -C" to create the config file there
 						mkdir -p /usr/local/etc
 						noip2 -C
-						read -p 'Press any key to continue...'
+						read -rp 'Press any key to continue...'
 						G_EXEC systemctl restart noip2
 
 					fi
diff --git a/dietpi/dietpi-drive_manager b/dietpi/dietpi-drive_manager
index 4a3adf9b63..b178922aeb 100644
--- a/dietpi/dietpi-drive_manager
+++ b/dietpi/dietpi-drive_manager
@@ -522,7 +522,7 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return
 
 		if G_EXEC_NOHALT=1 G_EXEC umount "$target"; then
 
-			sed -i "\#[[:blank:]]$target[[:blank:]]#d" /etc/fstab # Only needed for networked drives currently...
+			sed -i "\#[[:blank:]]${target}[[:blank:]]#d" /etc/fstab # Only needed for networked drives currently...
 			rmdir "$target"
 			Init_Drives_and_Refresh
 
@@ -1768,7 +1768,7 @@ NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU u
 			if mount -t cifs -o username="$samba_clientuser",password="$samba_clientpassword",iocharset=utf8,uid=dietpi,gid=dietpi,file_mode=0770,dir_mode=0770,vers=$i "//$samba_clientname/$samba_clientshare" "$samba_fp_mount_target" &>> $fp_tmp; then
 
 				# Apply to fstab
-				sed -i "\#[[:space:]]$samba_fp_mount_target[[:space:]]#d" /etc/fstab
+				sed -i "\#[[:space:]]${samba_fp_mount_target}[[:space:]]#d" /etc/fstab
 				# - NB: Convert spaces to '\040': https://github.com/MichaIng/DietPi/issues/1201#issuecomment-339720271
 				echo "//$samba_clientname/${samba_clientshare//[[:space:]]/\\040} $samba_fp_mount_target cifs username=$samba_clientuser,password=$samba_clientpassword,iocharset=utf8,uid=dietpi,gid=dietpi,file_mode=0770,dir_mode=0770,vers=$i,_netdev,nofail,noauto,x-systemd.automount" >> /etc/fstab
 
@@ -1831,7 +1831,7 @@ NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU u
 		if mount -vt nfs -o port=2049 "$nfs_server_ip":/ $nfs_fp_mount_target &>> $fp_tmp; then
 
 			# Apply to fstab
-			sed -i "\#[[:space:]]$nfs_fp_mount_target[[:space:]]#d" /etc/fstab
+			sed -i "\#[[:space:]]${nfs_fp_mount_target}[[:space:]]#d" /etc/fstab
 			echo "$nfs_server_ip:/ $nfs_fp_mount_target nfs _netdev,nofail,noauto,x-systemd.automount" >> /etc/fstab
 
 			MENU_DRIVE_TARGET=$nfs_fp_mount_target
@@ -1854,7 +1854,7 @@ NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU u
 			if mount -vt nfs -o port=2049 "$nfs_server_ip":"$nfs_fp_server_share" $nfs_fp_mount_target &>> $fp_tmp; then
 
 				# Apply to fstab
-				sed -i "\#[[:space:]]$nfs_fp_mount_target[[:space:]]#d" /etc/fstab
+				sed -i "\#[[:space:]]${nfs_fp_mount_target}[[:space:]]#d" /etc/fstab
 				echo "$nfs_server_ip:$nfs_fp_server_share $nfs_fp_mount_target nfs _netdev,nofail,noauto,x-systemd.automount" >> /etc/fstab
 
 				MENU_DRIVE_TARGET=$nfs_fp_mount_target
diff --git a/dietpi/dietpi-letsencrypt b/dietpi/dietpi-letsencrypt
index a5cd16232f..189a9df441 100644
--- a/dietpi/dietpi-letsencrypt
+++ b/dietpi/dietpi-letsencrypt
@@ -342,13 +342,8 @@ Would you like to switch to DietPi-Software, to install one of the above?' && /b
 
 		#------------------------------------------------------------------------------------------------------
 
-		if (( ! $INPUT )); then
-
-			read -p '
-Press any key to continue...
-'
-
-		fi
+		(( $INPUT )) || read -rp '
+Press any key to continue...'
 
 	}
 
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 56573e21e2..3ddb48a1d5 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -16372,7 +16372,7 @@ Do you wish to continue with DietPi as a pure minimal image?'; then
 					tty=$(readlink -f /dev/serial0); tty={tty#/dev/}
 					if [[ $(</boot/cmdline.txt) =~ 'serial0' ]]; then
 
-						[[ $(</boot/cmdline.txt) =~ $tty ]] && sed -i "s/[[:blank:]]*console=$tty[^\"[:blank:]]*//" /boot/cmdline.txt || sed -i "s/serial0/$tty/" /boot/cmdline.txt
+						[[ $(</boot/cmdline.txt) =~ $tty ]] && sed -i "s/[[:blank:]]*console=${tty}[^\"[:blank:]]*//" /boot/cmdline.txt || sed -i "s/serial0/$tty/" /boot/cmdline.txt
 
 					fi
 					if [[ -f '/etc/systemd/system/getty.target.wants/serial-getty@serial0.service' ]]; then
diff --git a/dietpi/dietpi-update b/dietpi/dietpi-update
index c8941934ed..b6d52ae3ec 100644
--- a/dietpi/dietpi-update
+++ b/dietpi/dietpi-update
@@ -450,7 +450,7 @@ Do you wish to continue and update DietPi to v$COREVERSION_SERVER.$SUBVERSION_SE
 
 		#----------------------------------------------------------------
 		# Desktop run, exit key prompt
-		pgrep 'lxsession' &> /dev/null && read -p 'Press any key to exit DietPi-Update...'
+		pgrep 'lxsession' &> /dev/null && read -rp 'Press any key to exit DietPi-Update...'
 
 	fi
 	#----------------------------------------------------------------
diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index dfe9331b3e..bc8a868e3b 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -1064,7 +1064,7 @@ $log_content" || break # Exit error handler menu loop on cancel
 						exit_code=$?
 						G_DIETPI-NOTIFY -1 $exit_code 'Alternative command execution |'
 						# Exit retry loop if alternative command succeeded, else stay in menu loop and wait for key press to allow reviewing alternative command output
-						[[ $exit_code == 0 ]] && break 2 || read -p 'Press any key to return to error handler menu...'
+						[[ $exit_code == 0 ]] && break 2 || read -rp 'Press any key to return to error handler menu...'
 
 					fi
 
@@ -1072,7 +1072,7 @@ $log_content" || break # Exit error handler menu loop on cancel
 				elif [[ $G_WHIP_RETURNED_VALUE ]]; then
 
 					${G_EXEC_ARRAY_ACTION[$G_WHIP_RETURNED_VALUE]}
-					read -p 'Press any key to return to error handler menu...'
+					read -rp 'Press any key to return to error handler menu...'
 
 				fi
 
@@ -1926,8 +1926,8 @@ $log_content" || break # Exit error handler menu loop on cancel
 		# Replace password string by asterisks in output string
 		if [[ $GCI_PASSWORD == 1 ]]; then
 
-			local password=$(sed -E "s/^.*$pattern[[:blank:]]*//" <<< "$setting_raw")
-			setting_raw="$(sed -E "s/(^.*$pattern[[:blank:]]*).*$/\1/" <<< "$setting_raw")${password//?/*}"
+			local password=$(sed -E "s/^.*${pattern}[[:blank:]]*//" <<< "$setting_raw")
+			setting_raw="$(sed -E "s/(^.*${pattern}[[:blank:]]*).*$/\1/" <<< "$setting_raw")${password//?/*}"
 			unset -v password
 
 		fi
diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware
index 2bb0f5d6e4..1a9253ae10 100644
--- a/dietpi/func/dietpi-set_hardware
+++ b/dietpi/func/dietpi-set_hardware
@@ -1566,12 +1566,12 @@ Do you want to continue and DISABLE Bluetooth now?'; then
 				# - RPi
 				if (( $G_HW_MODEL < 10 )); then
 
-					sed -i "s/[[:blank:]]*console=$INPUT_ADDITIONAL[^\"[:blank:]]*//" /boot/cmdline.txt
+					sed -i "s/[[:blank:]]*console=${INPUT_ADDITIONAL}[^\"[:blank:]]*//" /boot/cmdline.txt
 
 				# - Odroid C1/C2/XU4
 				elif (( $G_HW_MODEL < 12 )); then
 
-					sed -i "s/[[:blank:]]*console=$INPUT_ADDITIONAL[^\"[:blank:]]*//" /boot/boot.ini
+					sed -i "s/[[:blank:]]*console=${INPUT_ADDITIONAL}[^\"[:blank:]]*//" /boot/boot.ini
 
 				elif (( $ARMBIAN )); then
 
diff --git a/dietpi/func/dietpi-set_software b/dietpi/func/dietpi-set_software
index eced8a5d11..ea81888ebe 100644
--- a/dietpi/func/dietpi-set_software
+++ b/dietpi/func/dietpi-set_software
@@ -424,7 +424,7 @@ _EOF_
 
 			# Remove from sudoers
 			[[ -f /etc/sudoers.d/$INPUT_MODE_VALUE ]] && rm /etc/sudoers.d/"$INPUT_MODE_VALUE"
-			sed -i "/^$INPUT_MODE_VALUE[[:blank:]]/d" /etc/sudoers.d/dietpi # pre-v6.29
+			sed -i "/^${INPUT_MODE_VALUE}[[:blank:]]/d" /etc/sudoers.d/dietpi # pre-v6.29
 
 		else
 
diff --git a/dietpi/misc/dietpi-justboom b/dietpi/misc/dietpi-justboom
index b7f9821327..662f4cd3bd 100644
--- a/dietpi/misc/dietpi-justboom
+++ b/dietpi/misc/dietpi-justboom
@@ -301,7 +301,7 @@ Please select a soundcard via 'dietpi-config' or install ALSA, or ideally an aud
 				[[ $stream_result == 'closed' ]] && G_DIETPI-NOTIFY 1 'Detailed info is only available when audio is being played, play some music first!'
 
 				G_DIETPI-NOTIFY 0 'Completed, press any key to exit...\n'
-				read -p 'Press any key to exit...'
+				read -rp 'Press any key to exit...'
 
 			elif [[ $G_WHIP_RETURNED_VALUE == 'Subwoofer Mode' ]]; then
 
diff --git a/rootfs/etc/bashrc.d/dietpi.bash b/rootfs/etc/bashrc.d/dietpi.bash
index 5c416aec58..1e9e0a4f96 100644
--- a/rootfs/etc/bashrc.d/dietpi.bash
+++ b/rootfs/etc/bashrc.d/dietpi.bash
@@ -33,7 +33,7 @@
 	fi
 
 	# Workaround if SSH client sets an unsupported $TERM string: https://github.com/MichaIng/DietPi/issues/2034
-	if [[ $SSH_TTY ]] && ! toe -a | grep -q "^$TERM[[:blank:]]"; then
+	if [[ $SSH_TTY ]] && ! toe -a | grep -q "^${TERM}[[:blank:]]"; then
 
 		TERM_old=$TERM
 		[[ $TERM == *'256'* ]] && export TERM='xterm-256color' || export TERM='xterm'
diff --git a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
index 8002a0b8b0..ba69d9ba2a 100755
--- a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
+++ b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
@@ -133,7 +133,7 @@
 		# Apply language (locale)
 		local autoinstall_language=$(sed -n '/^[[:blank:]]*AUTO_SETUP_LOCALE=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
 		grep -q "^$autoinstall_language UTF-8$" /usr/share/i18n/SUPPORTED || autoinstall_language='C.UTF-8'
-		if ! locale | grep -qE "(LANG|LC_ALL)=[\'\"]?$autoinstall_language[\'\"]?" || ! locale -a | grep -qiE 'C\.UTF-?8'; then
+		if ! locale | grep -qE "(LANG|LC_ALL)=[\'\"]?${autoinstall_language}[\'\"]?" || ! locale -a | grep -qiE 'C\.UTF-?8'; then
 
 			G_DIETPI-NOTIFY 2 "Setting locale $autoinstall_language. Please wait..."
 			/boot/dietpi/func/dietpi-set_software locale "$autoinstall_language"

From 3e1fc6fc77aacefd639bf56753e19fe65bd9e9dc Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 16:37:27 +0200
Subject: [PATCH 05/13] v6.31

+ DietPi-Set_hardware | https://github.com/MichaIng/DietPi/pull/3644
---
 dietpi/func/dietpi-set_hardware | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware
index 1a9253ae10..0806cbb788 100644
--- a/dietpi/func/dietpi-set_hardware
+++ b/dietpi/func/dietpi-set_hardware
@@ -1589,12 +1589,12 @@ Do you want to continue and DISABLE Bluetooth now?'; then
 				# - Pine A64: On ARMbian ttyS0 boot output is forced and custom console is not possible via armbianEnv.txt
 				elif (( $G_HW_MODEL == 40 )); then
 
-					sed -i "/^[[:blank:]]*console=$INPUT_ADDITIONAL[^\"[:blank:]]*$/d" $FP_UENV # New style: One variable each line
-					sed -i "s/[[:blank:]]*console=$INPUT_ADDITIONAL[^\"[:blank:]]*//" $FP_UENV # Old style: Multiple variables possible each line
+					sed -i "/^[[:blank:]]*console=${INPUT_ADDITIONAL}[^\"[:blank:]]*$/d" $FP_UENV # New style: One variable each line
+					sed -i "s/[[:blank:]]*console=${INPUT_ADDITIONAL}[^\"[:blank:]]*//" $FP_UENV # Old style: Multiple variables possible each line
 
 				#elif (( $G_HW_MODEL == 70 )); then
 
-				#	sed -i "s/[[:blank:]]*console=$INPUT_ADDITIONAL[^\"[:blank:]]*//" $FP_UENV
+				#	sed -i "s/[[:blank:]]*console=${INPUT_ADDITIONAL}[^\"[:blank:]]*//" $FP_UENV
 
 				fi
 

From 1cf3b08dae2078a235d6bf0703b75219b88583ac Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Fri, 3 Jul 2020 23:05:53 +0200
Subject: [PATCH 06/13] v6.31

+ DietPi-Patch | Copy correct license file: https://github.com/MichaIng/DietPi/issues/3628#issuecomment-653676563
---
 PREP_SYSTEM_FOR_DIETPI.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
index 2626b757eb..8dd575f445 100644
--- a/PREP_SYSTEM_FOR_DIETPI.sh
+++ b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -652,7 +652,7 @@ Currently installed: $G_DISTRO_NAME (ID: $G_DISTRO)"; then
 
 		G_EXEC mv "DietPi-$G_GITBRANCH/dietpi.txt" /boot/
 		G_EXEC mv "DietPi-$G_GITBRANCH/README.md" /boot/dietpi-README.md
-		G_EXEC mv "DietPi-$G_GITBRANCH/LICENSE.txt" /boot/dietpi-LICENSE.txt
+		G_EXEC mv "DietPi-$G_GITBRANCH/LICENSE" /boot/dietpi-LICENSE.txt
 		G_EXEC mv "DietPi-$G_GITBRANCH/CHANGELOG.txt" /boot/dietpi-CHANGELOG.txt
 
 		# Reading version string for later use

From 836b04f9c89850f5df8f1763ac442b622c9b564d Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sat, 4 Jul 2020 12:20:04 +0200
Subject: [PATCH 07/13] v6.31

+ DietPi-PREP | Remove all autologin configs for all TTYs: https://github.com/MichaIng/DietPi/issues/3628#issuecomment-653693758
---
 PREP_SYSTEM_FOR_DIETPI.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
index 8dd575f445..f3561389cc 100644
--- a/PREP_SYSTEM_FOR_DIETPI.sh
+++ b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -1201,7 +1201,8 @@ _EOF_
 		#	Below required if DietPi-PREP is executed from chroot/container, so RPi firstrun scripts are not executed
 		[[ -f '/etc/init.d/resize2fs_once' ]] && rm -v /etc/init.d/resize2fs_once # https://github.com/RPi-Distro/pi-gen/blob/master/stage2/01-sys-tweaks/files/resize2fs_once
 		[[ -f '/boot/cmdline.txt' ]] && sed -i 's| init=/usr/lib/raspi-config/init_resize\.sh||' /boot/cmdline.txt # https://github.com/RPi-Distro/pi-gen/blob/master/stage2/01-sys-tweaks/00-patches/07-resize-init.diff
-		[[ -f '/etc/systemd/system/getty@tty1.service.d/autologin.conf' ]] && rm -v /etc/systemd/system/getty@tty1.service.d/autologin.conf # https://github.com/MichaIng/DietPi/issues/3570#issuecomment-648988475
+		# - Remove all autologin configs for all TTYs: https://github.com/MichaIng/DietPi/issues/3570#issuecomment-648988475, https://github.com/MichaIng/DietPi/issues/3628#issuecomment-653693758
+		rm -fv /etc/systemd/system/*getty@*.service.d/*autologin*.conf
 
 		# - make_nas_processes_faster cron job on ROCK64 + NanoPi + PINE A64(?) images
 		[[ -f '/etc/cron.d/make_nas_processes_faster' ]] && rm /etc/cron.d/make_nas_processes_faster

From 657b241439e3c9e405bffe63ea36184e664f8920 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sat, 4 Jul 2020 14:40:27 +0200
Subject: [PATCH 08/13] v6.31

+ DietPi-FirstBoot | Assure that root dir / permissions 755 root:root since this can be manipulated by flash method/program/user in rare cases: https://github.com/MichaIng/DietPi/issues/3646#issuecomment-653739919
---
 rootfs/var/lib/dietpi/services/dietpi-firstboot.bash | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
index ba69d9ba2a..513cdb82e7 100755
--- a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
+++ b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
@@ -289,6 +289,11 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
+
+	# Failsafe: https://github.com/MichaIng/DietPi/issues/3646#issuecomment-653739919
+	chown root:root /
+	chmod 755 /
+
 	# Apply dietpi.txt settings, device specific workarounds and reset hardware ID + SSH host keys
 	Apply_DietPi_FirstRun_Settings
 

From 4252fc6a93525f2f213eb946946fa6deea46fbb4 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 5 Jul 2020 15:15:55 +0200
Subject: [PATCH 09/13] v6.31

+ RC up
---
 dietpi/server_version-6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/server_version-6 b/dietpi/server_version-6
index 0c373aade0..e72506a847 100644
--- a/dietpi/server_version-6
+++ b/dietpi/server_version-6
@@ -1,3 +1,3 @@
 6
 31
-1
+2

From 52051984b04caa89530c7b960b812e0405818f63 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 5 Jul 2020 15:18:12 +0200
Subject: [PATCH 10/13] v6.31

+ DietPi-Globals | Default RC up
---
 dietpi/func/dietpi-globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index bc8a868e3b..a0af394747 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -70,7 +70,7 @@
 	# - Assign defaults/code version as fallback
 	[[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=6
 	[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=31
-	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=1
+	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=2
 	[[ $G_GITBRANCH ]] || G_GITBRANCH='master'
 	[[ $G_GITOWNER ]] || G_GITOWNER='MichaIng'
 	# - Save current version and Git branch

From 8a4f49c02af3fa638eda1e84adbbeb4fb2c4cf08 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 5 Jul 2020 15:36:00 +0200
Subject: [PATCH 11/13] v6.31

+ CHANGELOG | Minor spelling fixes
---
 CHANGELOG.txt | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 67ca1020ec..19024521f7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,7 +3,7 @@ v6.31
 
 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
-- Odroid C4 | Support for this new Hardkernel SBC has been added to allow image creation based on Meverics Odroid repository, including Kodi support.
+- Odroid C4 | Support for this new Hardkernel SBC has been added to allow image creation based on Meveric's Odroid repository, including Kodi support.
 - Network | "ping" can now be used by all users without any file capabilities, sudo or setuid. For this we allow all users to create native ICMP sockets which are available since Linux 3.X but disabled by default on Debian. Other distributions and systemd (upstream) have this enabled by default and for security and usability reasons we follow them: https://fedoraproject.org/wiki/Changes/EnableSysctlPingGroupRange
 - DietPi-Login | A new setting has been added which allows to skip the interactive GPLv2 license agreement on first login. Add/set "AUTO_SETUP_ACCEPT_LICENSE=1" in (/boot/)dietpi.txt in which case we assume you read and agreed the license text at least once. Many thanks to @mrbluecoat for reporting the urgent use-case of Chromium kiosk mode autostart without keyboard attached: https://github.com/MichaIng/DietPi/issues/3326
 - DietPi-Cleaner | Enhanced performance of the files cleaner if /mnt is skipped, especially in combination with large drives or network mounts. Many thanks to @maartenlangeveld for revealing the underlying issue: https://github.com/MichaIng/DietPi/issues/3609
@@ -78,7 +78,7 @@ API Changes:
 - DietPi-Globals | The global variables G_HW_ARCH_DESCRIPTION and G_HW_MODEL_DESCRIPTION have been renamed to G_HW_ARCH_NAME and G_HW_MODEL_NAME. The new variables G_HW_UUID (DietPi-internal device UUID) and G_ROOTFS_DEV (RootFS device path) are available. On RPi additionally G_HW_REVISION, G_HW_PCB_REVISION, G_HW_MEMORY_SIZE and G_HW_MANUFACTURER are available, the revision code and its decoded information: https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
 - DietPi-Globals | G_RUN_CMD and G_ERROR_HANDLER have been removed and replaced with G_EXEC. Basically G_EXEC can be used the same way G_RUN_CMD was before and it is wider configurable to make manual G_ERROR_HANDLER usage obsolete where custom solution menu entries or command output parsing is required, e.g. to check for errors that do not produce exit codes. Visual change for regular DietPi users is that every error handled command can be retried, a subshell can be opened to investigate or fix the originating issue and, for experienced users, the command can be altered, e.g. if a download link has changed or an expected file has been moved manually to a new path. Further details can be found in the script: /boot/dietpi/func/dietpi-globals
 - DietPi-Globals | G_FILE_EXISTS has been removed, as it was used only a single time in our code and usually it needs to be checked and handled explicitly, whether it is a file, directory, symlink with or without existing target.
-- DietPi-Globals | The new global funktions G_CHECK_CON and G_CHECK_DNS have been added to test general network connectivity and DNS resolver based on dietpi.txt settings.
+- DietPi-Globals | The new global functions G_CHECK_CON and G_CHECK_DNS have been added to test general network connectivity and DNS resolver based on dietpi.txt settings.
 
 Changes / Improvements / Optimisations:
 - NanoPi M4V2 | Initial hardware identifier (ID: 58) and support for this device has been added to DietPi. Many thanks to @purist doing this request: https://dietpi.com/phpbb/viewtopic.php?f=12&t=6451
@@ -272,7 +272,7 @@ Bug Fixes:
 - DietPi-Software | Plex Media Server: Resolved an issue where DietPi-Update failed for versions prior to v6.23, due to the obsolete Plex Media Server dev2day repository being offline now. This repo is now removed via pre-patches, prior to G_AGUP being called. During regular patches PMS is reinstalled, applying the new official APT repo. Many thanks to @p-roman for reporting this issue: https://github.com/MichaIng/DietPi/issues/3038
 - DietPi-Software | Pi-hole: Resolved an issue, where the blocking page was only shown, if the blocked URL contained the domain only, without any appending path: https://github.com/MichaIng/DietPi/pull/3072
 - DietPi-Software | TigerVNC: Resolved an issue on Debian Buster, where the VNC connection fails immediately due to an external bug, if no read-only password has been applied via vncpasswd. Many thanks to @Trunkzeh for reporting this issue and providing the workaround: https://github.com/MichaIng/DietPi/issues/3070
-- DietPi-Software | TigerVNC: Resolved minor error messages on login and in logs: "No session for PID ...", "DE is (null); No desktop environnement set, fallback to LXDE", "Use of uninitialized value $proto in socket at /usr/bin/tigervncserver"
+- DietPi-Software | TigerVNC: Resolved minor error messages on login and in logs: "No session for PID ...", "DE is (null); No desktop environment set, fallback to LXDE", "Use of uninitialized value $proto in socket at /usr/bin/tigervncserver"
 - DietPi-Software | Netdata: Resolved an issue where install failed on Stretch systems. Many thanks to @Velociraptor85 for reporting this issue: https://github.com/MichaIng/DietPi/issues/3062
 - DietPi-Software | Amiberry: Resolved an issue where install failed on Buster due to changed library package version. The SDL2 library has been recompiled for Buster with minimal dependencies, thus X11 does not need to be installed anymore. Many thanks to @TuKo1982 for reporting this issue: https://github.com/MichaIng/DietPi/issues/3104
 
@@ -368,7 +368,7 @@ Jessie support:
 - The support for Debian Jessie is fading constantly by software titles and Debian itself, increasing the effort for us to work around the raising issues: https://github.com/MichaIng/DietPi/issues/2332
 - As a result we move Jessie systems to a dedicated "jessie-support" branch. Next DietPi v6.24 will still be merged into this branch as well, but for following updates it depends on how much additional related issues we face.
 - We highly recommend to migrate to Stretch as fast as possible.
-- Odroid C1: We have updated the image to Stretch based on ARMbian 4.18 kernel. Existing Jessie installations will be moved to the jessie-support branch: https://github.com/MichaIng/DietPi/issues/2561
+- Odroid C1: We have updated the image to Stretch based on Armbian 4.18 kernel. Existing Jessie installations will be moved to the jessie-support branch: https://github.com/MichaIng/DietPi/issues/2561
 
 Buster support:
 - DietPi-Software | Resolved the last failing installs on Debian Buster systems by either fixing or disabling them: phpMyAdmin and Tomcat8 are currently not available on non-RPi Buster systems.
@@ -377,7 +377,7 @@ Buster support:
 Changes / Improvements / Optimisations:
 - DietPi-Banner | Added support for DietPi message of the day (MOTD). This is enabled by default, however, can be disabled. Checks for latest MOTD once a day.
 - DietPi-Banner | Always prints the local IP during boot mode display: https://github.com/MichaIng/DietPi/issues/2681
-- DietPi-Benchmark | Increased default survey RootFS and RAM benchmark sizes. 100MB (from 10MB) for RootFS. RAM is 1/4 of available. This is ensure a more accurate calculation of throughput when we divide bytes against time, to obtain the MB/s result. Benchmarks now also run at Nice -19 and realtime I/O with priority 0 (highest).
+- DietPi-Benchmark | Increased default survey RootFS and RAM benchmark sizes. 100 MiB (from 10 MiB) for RootFS. RAM is 1/4 of available. This is ensure a more accurate calculation of throughput when we divide bytes against time, to obtain the MB/s result. Benchmarks now also run at Nice -19 and realtime I/O with priority 0 (highest).
 - DietPi-Cleaner | Added a confirmation prompt, before removal of offline docs and man pages, as this may cause APT issues in some circumstances. Many thanks to @maartenlangeveld for reporting this issue: https://github.com/MichaIng/DietPi/issues/2751
 - DietPi-LetsEncrypt | When applying to Lighttpd, "webroot" authentication is now used instead of "standalone". This allows the auto-renewal service to succeed while Lighttpd is running. Many thanks to @minnux for testing this method: https://github.com/MichaIng/DietPi/issues/2680#issuecomment-480095449
 - DietPi-Arr_to_RAM | With v6.18 we silently added a new script (for Stretch and above) that allows linking Sonarr/Radarr/Lidarr database files to RAM, increasing access performance, reducing disk I/O and avoiding constant external HDD spinning due to the very regular access to these files. This script has gone through some rework and polishing and can now be enabled to automatically link those databases to RAM on boot and store them back to disk on shutdown. For more details read: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5828. Many thanks to @Dr0bac for providing valuable input and testing the development progress constantly: https://github.com/MichaIng/DietPi/issues/2689
@@ -411,7 +411,7 @@ Bug Fixes:
 - DietPi-Software | Transmission: Resolved an issue where double quotes in global software password caused a service startup failure. Many thanks to @Drew80 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2484#issuecomment-480675168
 - DietPi-Software | WireGuard: Resolved an issue where IPv6 connections did not work with enabled IPv6 forwarding. Many thanks to @schnuckz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2691
 - DietPi-Software | Subsonic: Resolved an issue where FFmpeg transcoder might not have been applied correctly. Many thanks to @spectrumcomputing for reporting this issue: https://github.com/MichaIng/DietPi/issues/2697
-- DietPi-Software | AmiBerry: Resolved an issue where no login prompt was present when exiting AmiBerry from fastboot mode. Many thanks to @Trigger58 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2703#issuecomment-482471440
+- DietPi-Software | Amiberry: Resolved an issue where no login prompt was present when exiting Amiberry from fastboot mode. Many thanks to @Trigger58 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2703#issuecomment-482471440
 - DietPi-Software | Logitech Media Server: Resolved an issue where certain plugins failed due to missing "libio-socket-ssl-perl". Many thanks to @noobian and @Edward for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=9&t=5824
 - DietPi-Software | Fail2Ban: Resolved an issue where the service silently failed due to wrong log level settings on Stretch and Buster systems. Many thanks to @joaofl for reporting this issue: https://github.com/MichaIng/DietPi/issues/90#issuecomment-485140236
 - DietPi-Software | Redis: Resolved an issue on Jessie systems where the service fails to start due to wrong shipped permissions from Debian package: https://github.com/MichaIng/DietPi/issues/2736
@@ -449,7 +449,7 @@ Changes / Improvements / Optimisations:
 - DietPi-Software | Aria2: Tweaked settings to enhance 3rd party plugin support and removed deprecated/doubled entries. Many thanks to @msongz for the commit: https://github.com/MichaIng/DietPi/pull/2538
 - DietPi-Software | UrBackup: Now installs updated version 2.3.7. Many thanks to @DeathIsUnknown for the information: https://github.com/MichaIng/DietPi/issues/2577
 - DietPi-Software | Deluge: Reworked the installer to better match the Debian package defaults and recommendations/examples from official docs. Deluge now runs as user "debian-deluged", logs have been moved to "/var/log/deluged/" and the init.d service with its traces are removed, which are all pre-generated by the Debian APT package. The systemd units have been adjusted according to the official Deluge documentation. These changes are applied as well to existing installs during DietPi update, the old user "deluge" and obsolete configurations are removed. Your active configurations and data are preserved, the installer has been as well enhanced to better handle existing installs and never touch existing configs. Note that access to the Deluge console has to be done as user "debian-deluged" (sudo -u debian-deluged deluge-console). A related access issue to the console has been fixed by this as well. Many thanks to @seanmikhaels for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5525
-- DietPi-Software | AmiBerry: Updated to latest version (2.25), thanks @midwan: https://github.com/MichaIng/DietPi/issues/2599
+- DietPi-Software | Amiberry: Updated to latest version (2.25), thanks @midwan: https://github.com/MichaIng/DietPi/issues/2599
 - DietPi-Software | Netdata: On Debian Stretch/Buster and Raspbian Buster an up-to-date APT package is available, which will now be installed instead of our custom build. Many thanks to @74cmonty for this information: https://github.com/MichaIng/DietPi/issues/2446
 - DietPi-Software | DietPi-RAMlog: When installing/enabling RAMlog, the /var/log mount point will be now cleaned before mounting the tmpfs on it, while preserving the existing logs metadata. This resolves a warning on early boot stage and frees the disk space consumed by the disk log before.
 - DietPi-Software | rTorrent: Runs now as user "rtorrent" and creates files as group "dietpi" with 775/664 permissions. Enabled Buster support and enhanced config file handling on reinstall: https://github.com/MichaIng/DietPi/pull/2633
@@ -518,7 +518,7 @@ Changes / Improvements / Optimisations:
 - DietPi-Config | RPi: Added info to "hifiberry-dacplus" sound device overlay that it supports the AMP2 DAC. Thanks to @Lat Dior for reporting the issue and testing the solution: https://dietpi.com/phpbb/viewtopic.php?t=5396
 - DietPi-Config | WiFi Hotspot: You can now toggle support for 802.11 N. Please note this is device and compatibility dependent, mileage may vary.
 - DietPi-Drive_Manager | Now allows to check & repair the boot file system and trigger it for root file system on next reboot: https://github.com/MichaIng/DietPi/issues/1740#issuecomment-388325204
-- DietPi-Software | AmiBerry: Updated to v2.24, thanks @midwan! Brings several bug fixes, new features and improvements over the previous version (2.19). Please check the version history for full details on the changes made: https://github.com/midwan/amiberry/wiki/Version-history
+- DietPi-Software | Amiberry: Updated to v2.24, thanks @midwan! Brings several bug fixes, new features and improvements over the previous version (2.19). Please check the version history for full details on the changes made: https://github.com/midwan/amiberry/wiki/Version-history
 - DietPi-Software | DietPi-NordVPN: Now available for installation. Includes a GUI which allows for easy connection to a list of NordVPN servers 'dietpi-nordvpn'. If you need a NordVPN subscription, please use this link: https://go.nordvpn.net/aff_c?offer_id=15&aff_id=5305&url_id=902
 - DietPi-Software | WireGuard VPN is now available for installation. Is can be easily configured as client or as server, passing either all client traffic through the tunnel, local network access only, or server access only, e.g. as well in combination with Pi-hole, to have remote ad blocking.
 - DietPi-Software | SickRage has been replaced by Medusa, which is now available for install: https://github.com/MichaIng/DietPi/issues/2239
@@ -810,7 +810,7 @@ General | Sparky SBC: Added driver to support RTL8812AU WiFi based chipsets: htt
 DietPi-Globals | G_THREAD_WAIT: Now displays errors for each thread, if they occurred.
 DietPi-Config | NTP mirror selection has been reworked. It allows now to add local and external non-pool.ntp.org servers and local gateway auto detection: https://github.com/MichaIng/DietPi/issues/1688
 DietPi-Config | Display Options > Backlight Brightness: Now available for Intel compatible backlight devices.
-DietPi-Explorer | Whiptail based, minimial/lightweight file explorer and manager now available for use!
+DietPi-Explorer | Whiptail based, minimal/lightweight file explorer and manager now available for use!
 DietPi-Services | You can now include custom services, and, exclude DietPi controlling services known to it. Please see the following file '/DietPi/dietpi/.dietpi-services_include_exclude' for more information: https://github.com/MichaIng/DietPi/issues/1114#issuecomment-411325075
 DietPi-Software | A new unified download&install function is implemented, which allows more consistent download and install of software, using /tmp RAMFS as working directory and parallel dependencies installation via G_THREAD.
 DietPi-Software | Koel: Installation will now skip webserver, as Koel uses PHP-CLI instead. To not mess with webserver served pages, Koel install directory is moved to "/mnt/dietpi_userdata/koel", for existing installs as well.
@@ -1009,7 +1009,7 @@ DietPi-LetsEncrypt | Minor code and error handling improvements, as well increas
 DietPi-Process_tool | Rewrite of save file, to allow for stringed entries. The save file will be cleared during the update, to support this feature: https://github.com/MichaIng/DietPi/issues/1750
 DietPi-Process_tool | Added Plex Media Server to process tool, however, transcoding will not be affected by this: https://github.com/MichaIng/DietPi/issues/1750#issuecomment-386826317
 DietPi-Set_Hardware | Allo Piano firmware is now installed on demand and will be removed on update, if not chosen as sound card: https://github.com/MichaIng/DietPi/issues/1656
-DietPi-Software | AmiBerry (Amiga Emulator): Updated to v2.19, contains bug fixes and improvements: https://github.com/MichaIng/DietPi/issues/1707#issue-314377609
+DietPi-Software | Amiberry (Amiga Emulator): Updated to v2.19, contains bug fixes and improvements: https://github.com/MichaIng/DietPi/issues/1707#issue-314377609
 DietPi-Software | Chromium: No longer requires a desktop and can be installed as a lightweight single use program, using dietpi-autostart to run under kiosk mode. Many thanks to @AYapejian! 720p is the default window size, please see '/var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh' for full options when running under 'dietpi-autostart' mode: https://github.com/MichaIng/DietPi/issues/1737
 DietPi-Software | Readymedia (MiniDLNA): Removed ALSA pre-req as it is not required. Many thanks to @bokiroki: https://github.com/MichaIng/DietPi/issues/1712
 DietPi-Software | Pi-hole: Enabled support for FTLDNS: https://github.com/MichaIng/DietPi/issues/1696
@@ -1017,7 +1017,7 @@ DietPi-Software | Gitea: Updated to latest version (1.4), for new installations
 DietPi-Software | PHPBB3: Latest version update (3.2.2), for new installations only.
 DietPi-Software | Docker: Enabled for ARMv8 devices: https://github.com/MichaIng/DietPi/issues/1736
 PREP | G_HW_MODEL: Added for 'OrangePi PC Plus'. Many thanks to @SuBLiNeR: https://github.com/MichaIng/DietPi/pull/1704
-PREP | Optimized rootfs re-parition and resize. This will reduced the required inital system reboot count by one. Will take affect from official v6.8 DietPi images and onwards.
+PREP | Optimized rootfs re-parition and resize. This will reduced the required initial system reboot count by one. Will take affect from official v6.8 DietPi images and onwards.
 
 Bug Fixes:
 General | Remote SCP/Rsync fix when running under 'dietpi' user: https://github.com/MichaIng/DietPi/issues/1703
@@ -1033,7 +1033,7 @@ DietPi-LetsEncrypt | Now skips any webserver configuration edit, if CertBot exec
 DietPi-Software | Pi-SPC: PATH fix for sds.sh.
 DietPi-Software | WiringPi: Now installed to '$HOME/WiringPi', previously this would be wiringPi-HEAD-8d188fa.
 DietPi-Software | XRDP: Resolved an issue with blue screen running under Xorg. VNC4 is now installed by default, and the new connection method is 'Xvnc': https://github.com/MichaIng/DietPi/issues/1727#issuecomment-383858979
-DietPi-Software | AmiBerry: Fix for standard boot SDL2 keyboard leaking to background. Please note fast boot is still affected by the SDL2 keyboard leak: https://github.com/MichaIng/DietPi/issues/1707
+DietPi-Software | Amiberry: Fix for standard boot SDL2 keyboard leaking to background. Please note fast boot is still affected by the SDL2 keyboard leak: https://github.com/MichaIng/DietPi/issues/1707
 
 Allo GUI v7:
 - Resolved errors with swapfile display/change.
@@ -1063,9 +1063,9 @@ DietPi-Config | (RPi) Resolved an issue where Samba client would fail to mount.
 DietPi-Software | OpenJDK (RPi): Resolved an external bug with installation of this package via RPi repo, that would error on installation: https://github.com/MichaIng/DietPi/issues/1682
 DietPi-Software | Sonarr: Resolved failed installation for ARMv8 devices: https://github.com/MichaIng/DietPi/issues/1502
 DietPi-Software | Mono: Uninstalling this program, will now also uninstall the mono APT packages.
-DietPi-Software | NodeRed: User is now added to the GPIO group automatically: https://github.com/MichaIng/DietPi/issues/1687
+DietPi-Software | Node-RED: User is now added to the GPIO group automatically: https://github.com/MichaIng/DietPi/issues/1687
 DietPi-Software | Deluge: Resolved multiple issues where the deluge service would sometimes fail to run: https://github.com/MichaIng/DietPi/issues/1689#issuecomment-379017388
-DietPi-Software | Pi-hole: Workaround applied to prevent lighttpd install during Pi-hole script, when Apache2/Nginx is installed: https://github.com/MichaIng/DietPi/issues/1696
+DietPi-Software | Pi-hole: Workaround applied to prevent Lighttpd install during Pi-hole script, when Apache2/Nginx is installed: https://github.com/MichaIng/DietPi/issues/1696
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -1111,7 +1111,7 @@ DietPi-Config | Sound cards (RPi): Added option for ApplePi DAC: https://github.
 DietPi-Process_Tool | Added ability to add custom process entries to "/DietPi/dietpi/.dietpi-process_tool_include". Add one process each line with the format <chosenName>:<executableFileName>. Check via htop, e.g. "DHCP client:dhclient"
 DietPi-Software | NoMachine: Installation updated to 6.0.78 (new installations only): https://github.com/MichaIng/DietPi/issues/1340#issuecomment-372845397
 DietPi-Software | Squeezebox server: Updated to systemd native service: https://github.com/MichaIng/DietPi/issues/1613
-DietPi-Software | AmiBerry: Updated to 2.18. Improved audio latency, Unique new feature: WHDLoad booter! (check the wiki for details), bug fixes: https://github.com/MichaIng/DietPi/issues/1410#issuecomment-374060452
+DietPi-Software | Amiberry: Updated to 2.18. Improved audio latency, Unique new feature: WHDLoad booter! (check the wiki for details), bug fixes: https://github.com/MichaIng/DietPi/issues/1410#issuecomment-374060452
 DietPi-Software | RPi: For all software titles which require unrar, unrar-nonfree is now installed via Debian package (previously unrar-free): https://github.com/MichaIng/DietPi/issues/865#issuecomment-375315827
 DietPi-Software | MPD: Resolved an issue where "libwrap0" (libwrap.so.0) was missing to start MPD service: https://dietpi.com/phpbb/viewtopic.php?f=9&t=2779
 DietPi-Software | MPD: Updated to 0.20.18. Compiled with UPnP support enabled: https://github.com/MichaIng/DietPi/issues/1614
@@ -1216,7 +1216,7 @@ DietPi-Config | WiFi: Now supports connecting to hidden WiFi networks, thanks @s
 DietPi-LetsEncrypt | On Jessie, changed certificate auto renewal to native certbot renew command, to prevent certificate duplication: https://github.com/MichaIng/DietPi/issues/734
 DietPi-LetsEncrypt | On Stretch, added automated Minio certificate renewal. Rerun "dietpi-letsencrypt" on your Stretch system to gain this feature.
 DietPi-Process_tool | Reduction of onscreen print. Additional status print will only occur when HIERARCHY is less than 2 and/or an error occurs.
-DietPi-Software | AmiBerry: Massive update to v2.14 and SDL2, new installations only. Currently for RPi's under Stretch only, however, we have plans to implement for other devices: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=64#p64 https://github.com/MichaIng/DietPi/issues/1410
+DietPi-Software | Amiberry: Massive update to v2.14 and SDL2, new installations only. Currently for RPi's under Stretch only, however, we have plans to implement for other devices: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=64#p64 https://github.com/MichaIng/DietPi/issues/1410
 DietPi-Software | LMS/Squeezebox: Has undergone an install review and re-write. All archs are now supported for Stretch + Jessie: https://github.com/MichaIng/DietPi/issues/1496
 DietPi-Software | Pydio: Add PHP module 'intl' on installation, as requested via web ui warning: https://github.com/MichaIng/DietPi/issues/1240
 DietPi-Software | Nginx: To further reduce resource usage, by default 'nginx-light' will be installed now: https://github.com/MichaIng/DietPi/issues/1240
@@ -1251,7 +1251,7 @@ DietPi-Software | qBitTorrent: Resolved issue with failed login on Debian Jessie
 DietPi-Software | dietpi-software install: Command line run will now prevent disabled G_HW_ARCH G_HW_MODEL software titles, from being installed.
 DietPi-Software | MQTT Mosquito: Resolved issue with ARMv6 installation/binary: https://github.com/MichaIng/DietPi/issues/1306#issuecomment-366228445
 DietPi-Software | Automation - custom script: Resolved an issue with banners, where Google AIY would be incorrectly reported as installing: https://github.com/MichaIng/DietPi/issues/1514
-DietPi-Software | NodeRed: resolved an issue where the nodered user lacked a home dir, required for additional module installation: https://github.com/MichaIng/DietPi/issues/1446#issuecomment-366370800
+DietPi-Software | Node-RED: resolved an issue where the nodered user lacked a home dir, required for additional module installation: https://github.com/MichaIng/DietPi/issues/1446#issuecomment-366370800
 
 Allo Web Interface v6:
 Sparky SBC: Resolved an issue where USB1.1 compatibility setting would always be applied, when usb-dac selected.
@@ -1276,7 +1276,7 @@ Important Information:
 All DietPi images have been re-created. Existing installations (v159 or lower), can no longer be updated, or supported. To continue support, users must install the latest v6.0 image.
  - https://github.com/MichaIng/DietPi/issues/1385
  - All images are now Debian Stretch (excluding Odroid's)
- - ARMbian based images are now mainline kernel 4.13+.
+ - Armbian based images are now mainline kernel 4.13+.
  - Native PC (EFI): is now an ISO, with clonezilla bundled. Simplifies installation via Rufus write: https://github.com/MichaIng/DietPi/issues/1171#issuecomment-336522021
  - If you are happy with your existing installation of v159 (or lower), you are not required to install the v6.0 image, however, we cannot continue to provide support for v159 (or lower) installations.
 
@@ -1312,7 +1312,7 @@ DietPi-Software | ownCloud/Nextcloud: Automated backup restoring on install and
 DietPi-Software | ownCloud: Switch to non-package/archive installation. This allows usage of preferred web based updater.
 DietPi-Software | Nextcloud: Resolved OPcache admin panel warnings now also on Lighttpd
 DietPi-Software | UrBackup: Installation updated to latest version 2.1.20. For new installations only: https://github.com/MichaIng/DietPi/issues/1335
-DietPi-Software | NodeRed: Corrected user which nodered runs under, now runs as its own user, created during install: https://github.com/MichaIng/DietPi/issues/1294#issuecomment-354314318
+DietPi-Software | Node-RED: Corrected user which nodered runs under, now runs as its own user, created during install: https://github.com/MichaIng/DietPi/issues/1294#issuecomment-354314318
 DietPi-Software | SqueezeBox/LMS (Stretch): Installation resolved: https://github.com/MichaIng/DietPi/issues/1124
 DietPi-Software | MySQL: Completely remove MySQL from DietPi in favour of MariaDB: https://github.com/MichaIng/DietPi/issues/1397
 DietPi-Software | Ampache: MySQL DB and configs have been updated (adds correct userdata folder for music by default): https://github.com/MichaIng/DietPi/issues/1420

From 48db4f264f4743243cbcc2b7b75c0caaebbc1498 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 5 Jul 2020 15:40:39 +0200
Subject: [PATCH 12/13] v6.31

+ README.md | Remove /DietPi/ from files list, which is not used anymore
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 53c53a0871..f0dce87957 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,6 @@ along with this program.  If not, see https://www.gnu.org/licenses/
 ### DietPi Files
 
 - All files located in (recursively):
-  - `/DietPi/`
   - `/var/lib/dietpi/`
   - `/var/tmp/dietpi/`
   - `/boot/dietpi/`

From c5d259eb45cfb025aed3dde0053270b3d9df8c8f Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 5 Jul 2020 16:24:09 +0200
Subject: [PATCH 13/13] v6.31

+ DietPi-Survey_report | Uploads untouched since 2020 have been removed to give a more current stat picture
---
 .meta/dietpi-survey_report | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index b0d9acbf1c..4910cfada1 100644
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -751,7 +751,7 @@
 	</head>
 	<body>
 		<h2>DietPi-Survey report page</h2>
-                <i>Uploads since: 2019-01-01 00:00:00 UTC</i><br>
+                <i>Uploads since: 2020-01-01 00:00:00 UTC</i><br>
                 <i>Last update: $(TZ=UTC date "+%Y-%m-%d %T UTC")</i><br>
 		<br>
 		<table>