v6.25 (#2951)

RC v6.25.3

CHANGELOG.txt

@@ -1,5 +1,5 @@
 v6.25
-(XX/06/19)
+(03/07/19)
 
 Changes / Improvements / Optimisations:
 - System | By default the "haveged" entropy daemon is now installed on all DietPi systems and patched with v6.25. It assures the pool of random bits /dev/random stays filled by using additional sources of randomness. This solves a bunch of issues, including hanging or very long boot times, very long service (re)starts or timeout failures and on Buster hanging network access. Especially affected is PHP7.3-FPM but as well VPN servers and WiFi hotspots and potentially many other network or cryptography related tasks. More information on this topic: https://github.com/MichaIng/DietPi/issues/2806
@@ -32,6 +32,7 @@ Bug Fixes:
 - DietPi-Login | Resolved an issue where login leads to immediate logout if DietPi scripts were not loaded to DietPi-RAMdisk location. Many thanks to @LexiconCode for reporting this issue: https://github.com/MichaIng/DietPi/issues/2841#issuecomment-494567292
 - DietPi-Update | Resolved an issue where after update and reboot DietPi-Banner still shows update available with identical current and server versions.
 - DietPi-Cleaner | Resolved an issue where the cleaner ran into an endless loop if "Files" cleaner was used. Many thanks to @maartenlangeveld for reporting this issue: https://github.com/MichaIng/DietPi/issues/2837
+- DietPi-PREP | Resolved an issue where ifupdown (networking service) was autoremoved, which broke running network connections.
 - DietPi-Drive_Manager | Resolved an issue where idle spin down selection would always default to 241, instead of currently active value: https://github.com/MichaIng/DietPi/issues/2852
 - DietPi-Drive_Manager | Resolved an issue where eCryptfs fstab entries were not detected and preserved correctly. Many thanks to @johnvick for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?p=18428#p18283
 - DietPi-Drive_Manager | Resolved an issue where transferring the RootFS to a BTRFS formated drive fails. Since BTRFS support is not natively built into the RPi and Odroid kernel, a warning prompts and the transfer is aborted. Many thanks to @dieitpi for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?p=18164#p18164
@@ -46,11 +47,10 @@ Bug Fixes:
 - DietPi-Software | Transmission: Resolved an issue where settings applied via web UI did not survive a service restart or reboot. Many thanks to @chosen_too and @th0maz for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?p=17927#p17927
 - DietPi-Software | Docker: The official Docker installer now supports Debian Buster and a workaround for the still missing Raspbian Buster support has been implemented. Many thanks to @Qarasique for reporting this issue: https://github.com/MichaIng/DietPi/issues/2891
 
-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/2950
 
 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-Config | RPi: Enabling OpenGL/VC4 causes sound card selection to be invalid: https://github.com/MichaIng/DietPi/issues/2173
 - RPi | LXAppearance (on LXDE desktop) hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791
 - Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955
 - Odroid XU4 | Kodi freezes shortly on video playback: https://github.com/MichaIng/DietPi/issues/2584

PREP_SYSTEM_FOR_DIETPI.sh

@@ -925,6 +925,9 @@ _EOF_
 
 		l_message='Marking required packages as manually installed' G_RUN_CMD apt-mark manual ${aPACKAGES_REQUIRED_INSTALL[@]}
 
+		# Workaround: Installing required packages which would be autoremoved below due to missing dependants
+		# - resolvconf to prevent ifupdown removal on Buster mini.iso
+		G_AGI resolvconf
 		# Purging additional packages, that (in some cases) do not get autoremoved:
 		# - dbus: Not required for headless images, but sometimes marked as "important", thus not autoremoved.
 		# - dhcpcd5: https://github.com/MichaIng/DietPi/issues/1560#issuecomment-370136642

dietpi/dietpi-cleaner

@@ -193,7 +193,7 @@ Would you like to continue and start the cleaning process?" && Run_Cleaners
 		# Get on/off whilptail status
 		G_WHIP_CHECKLIST_ARRAY=()
 		local OnOff_Status='on'
-		local i=0
+		local i
 		for ((i=0; i<$MAX_CLEANERS; i++))
 		do
 
@@ -231,7 +231,6 @@ Would you like to continue and start the cleaning process?" && Run_Cleaners
 
 		if G_WHIP_CHECKLIST 'Please use the spacebar to toggle which cleaners are enabled.'; then
 
-			local i=0
 			for ((i=0; i<$MAX_CLEANERS; i++))
 			do
 
@@ -334,7 +333,7 @@ Would you like to continue and start the cleaning process?" && Run_Cleaners
 		ROOT_SPACE_USED_BEFORE=$ROOT_SPACE_USED_CURRENT
 
 		# Run enabled cleaners
-		local i=0
+		local i
 		for ((i=0; i<$MAX_CLEANERS; i++))
 		do
 
@@ -457,7 +456,7 @@ $G_PROGRAM_NAME simulation has finished: Press any key to continue..."
 			# Generate the find string
 			local find_string=''
 			echo -e '\nSearching for filenames matching:'
-			local i=''
+			local i
 			for i in ${!aCustomFiles[@]}
 			do
 
@@ -560,7 +559,7 @@ $G_PROGRAM_NAME simulation has finished: Press any key to continue..."
 			local line_count=$(wc -l < $FILEPATH_SETTINGS)
 
 			# Load settings
-			local i=0
+			local i
 			for ((i=0; i<$line_count; i++))
 			do
 
@@ -603,7 +602,7 @@ _EOF_
 
 		# Enabled/Disabled Cleaner Settings
 		[[ -f $FILEPATH_SETTINGS ]] && rm $FILEPATH_SETTINGS
-		local i=0
+		local i
 		for ((i=0; i<$MAX_CLEANERS; i++))
 		do
 

dietpi/dietpi-software

@@ -8444,7 +8444,6 @@ After=network.target sound.target
 User=mpd
 #Group=dietpi # Do not change, use system assigned groups, requires both dietpi and audio groups
 PermissionsStartOnly=true
-RuntimeDirectory=/run/mpd
 ExecStartPre=$(command -v mkdir) -p /run/mpd
 ExecStartPre=$(command -v chown) -R mpd:dietpi /run/mpd
 ExecStart=$(command -v mpd) --no-daemon /etc/mpd.conf
@@ -9771,7 +9770,7 @@ _EOF_
 
 				/DietPi/dietpi/func/create_mysql_db ampache ampache "$GLOBAL_PW"
 				Download_Install 'https://dietpi.com/downloads/mysql_databases/ampache_mysql_3.8.2-v6.0.zip'
-				mariadb ampache < ampache.sql
+				mysql ampache < ampache.sql
 				rm ampache.sql
 				# - Also update password here for rare but possible case that database was lost but config file still exists
 				[[ -f '/var/www/ampache/config/ampache.cfg.php' ]] && G_CONFIG_INJECT 'database_password =' "database_password = \"$GLOBAL_PW\"" /var/www/ampache/config/ampache.cfg.php
@@ -11400,7 +11399,7 @@ _EOF_
 
 				G_RUN_CMD systemctl start $MARIADB_SERVICE
 				# - Create database user only, database will be created automatically
-				mariadb -e "grant all privileges on ompd.* to ompd@localhost identified by '$GLOBAL_PW';"
+				mysql -e "grant all privileges on ompd.* to ompd@localhost identified by '$GLOBAL_PW';"
 				systemctl stop $MARIADB_SERVICE
 
 				cat << _EOF_ > /var/www/ompd/include/config.local.inc.php

dietpi/dietpi-update

@@ -183,8 +183,8 @@ Please download the latest DietPi image from: https://dietpi.com/#download'
 			# Mark 1st run update as completed
 			Apply_1st_Run_Update_Success
 
-			# Remove .update_available flag file (from disk as well, to prevent obsolete update notification after reboot)
-			rm -f /{DietPi,boot}/dietpi/.update_available
+			# Remove .update_available flag file
+			rm -f /DietPi/dietpi/.update_available
 
 			G_DIETPI-NOTIFY 0 'No update required, your DietPi installation is already up to date:'
 

dietpi/func/dietpi-globals

@@ -44,7 +44,7 @@
 	# DietPi Versions/Branch
 	G_DIETPI_VERSION_CORE=${G_DIETPI_VERSION_CORE:-6}
 	G_DIETPI_VERSION_SUB=${G_DIETPI_VERSION_SUB:-25}
-	G_DIETPI_VERSION_RC=${G_DIETPI_VERSION_RC:-2}
+	G_DIETPI_VERSION_RC=${G_DIETPI_VERSION_RC:-3}
 	G_GITBRANCH=${G_GITBRANCH:-master}
 	G_GITOWNER=${G_GITOWNER:-MichaIng}
 	[[ -f '/DietPi/dietpi/.version' && $(</DietPi/dietpi/.version) == '#!/bin/bash'* ]] && . /DietPi/dietpi/.version

dietpi/func/dietpi-ramdisk

@@ -107,6 +107,9 @@
 			# - Remove old DietPi form disk before storing new DietPi from RAM
 			#rm -R $FP_DISK/dietpi # Skip this to prevent unrecoverable removal of DietPi in case of error while copying to RAM
 
+			# - Remove status files that are recreated on boot/demand
+			rm -f $FP_RAM/dietpi/.{update_available,timesync_exit_status}
+
 			# - Store DietPi to disk
 			cp -Rf $FP_RAM/* $FP_DISK/ || EXIT_CODE=1
 

dietpi/patch_file

@@ -2051,12 +2051,14 @@ Use "dietpi-config" to adjust these settings to your needs.'
 			for i in /etc/init.d/armbian* /{etc,lib,usr/lib}/systemd/system/armbian*.service{,.d}
 			do
 
-				if [[ -e $i ]]; then
+				[[ -e $i ]] || continue
+				if [[ -f $i ]]; then
 
-					[[ -f $i ]] && systemctl disable --now ${i##*/}
-					rm -R $i
+					systemctl stop ${i##*/}
+					systemctl disable ${i##*/}
 
 				fi
+				rm -R $i
 
 			done
 			rm -f /etc/apt/apt.conf.d/*armbian*
@@ -2106,12 +2108,17 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
+			# Remove flag/status files from disk once, which will be done from now on before DietPi-RAMdisk stores to disk
+			rm -f /boot/dietpi/.{update_available,timesync_exit_status}
+			#-------------------------------------------------------------------------------
 			# Reinstalls:
 			#	O!MPD update to master: https://github.com/MichaIng/DietPi/pull/2884
 			#	myMPD update to master: https://github.com/MichaIng/DietPi/pull/2883
 			#	Gitea update to v1.8.X: https://github.com/MichaIng/DietPi/pull/2881
+			# MPD: Remove obsolete and wrong RuntimeDirectory definition: https://github.com/MichaIng/DietPi/commit/882ddfb533fdc1fa597231824810909770a910c9
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
+				[[ -f '/lib/systemd/system/mpd.service' ]] && sed -i '/^[[:blank:]]*RuntimeDirectory=/d' /lib/systemd/system/mpd.service
 				[[ -f '/var/www/ompd/include/config.inc.php' && ! -f '/var/www/ompd/include/config.local.inc.php' ]] && mv /var/www/ompd/include/config.inc.php /var/www/ompd/include/config.local.inc.php
 				if grep -q '^aSOFTWARE_INSTALL_STATE\[148\]=2' /DietPi/dietpi/.installed; then
 

dietpi/server_version-6

@@ -1,3 +1,3 @@
 6
 25
-2
+3

rootfs/var/lib/dietpi/services/dietpi-firstboot.bash

@@ -138,8 +138,8 @@
 
 		# Apply Language (Locale)
 		local autoinstall_language=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_LOCALE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
-		if [[ $autoinstall_language =~ 'UTF-8' ]] && ! locale | grep -qE "(LANG|LC_ALL)=[\'\"]?$autoinstall_language[\'\"]?" ||
-			! locale -a | grep -q 'en_GB.UTF-8'; then
+		grep -q "^$autoinstall_language UTF-8$" /usr/share/i18n/SUPPORTED || autoinstall_language='en_GB.UTF-8'
+		if ! locale | grep -qE "(LANG|LC_ALL)=[\'\"]?$autoinstall_language[\'\"]?" || ! locale -a | grep -qiE 'en_GB.UTF-?8'; then
 
 			G_DIETPI-NOTIFY 2 "Setting Locale $autoinstall_language. Please wait..."
 			/DietPi/dietpi/func/dietpi-set_software locale "$autoinstall_language"