Beta v6.31.2 (#3648)

MichaIng · Jul 5, 2020 · 01ad51a · 01ad51a
2 parents 36f3278 + c5d259e
commit 01ad51a
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 60 deletions.
diff --git 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>

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
diff --git 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
@@ -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/[email protected]/autologin.conf' ]] && rm -v /etc/systemd/system/[email protected]/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

diff --git 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/`

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

diff --git 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

diff --git 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
@@ -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/[email protected]' ]]; then

diff --git 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
@@ -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
@@ -1064,15 +1064,15 @@ $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
 
 				# Attempt targeted solution, passed via $G_EXEC_ARRAY_TEXT[] and $G_EXEC_ARRAY_ACTION[${G_EXEC_ARRAY_TEXT[]}]
 				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
@@ -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
 
@@ -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
 

diff --git 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
@@ -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/dietpi/server_version-6 b/dietpi/server_version-6
@@ -1,3 +1,3 @@
 6
 31
-1
+2
diff --git 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
@@ -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"
@@ -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