v120 - The big one!

v120 (24/06/16) Important Information: Raspberry Pi Wheezy | Support for Raspberry Pi Wheezy has now finished. I have uploaded a final Wheezy DietPi image which users must install if they want to continue using Wheezy. Please see here for more information: http://dietpi.com/phpbb/viewtopic.php?f=9&t=432 Image Downloads | All DietPi image downloads have been updated to v120. This includes all firmware/kernel/modules updates where applicable. http://dietpi.com/download Changes / Improvements / Optimizations: DietPi-Software > User Data | You can now setup a dedicated USB drive at any stage, on the fly : https://github.com/Fourdee/DietPi/issues/377 DietPi-Software > User Data | When changing user data location, DietPi will automatically move your existing data and setup required symlinks. DietPi-Software > User Data | You can now force Flash or USB drive user data locations on the fly, disabling the automatic setting. DietPi-Software > User Data | /mnt/dietpi_userdata will now always point to your user data location, even if its custom. DietPi-Software | Added DietPi installation option for Mate Desktop: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2073 . Many thanks to Xenformation (JK) for his contributions on this. DietPi-Software | Added DietPi installation option for GNUstep Desktop: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2072 . Many thanks to Xenformation (JK) for his contributions on this. DietPi-Software | Added DietPi installation option for NoMachine: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2071 . Many thanks to Xenformation (JK) for his contributions on this. DietPi-Software | Added DietPi installation option for XRDP: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=70#p2074 . Many thanks to Xenformation (JK) for his contributions on this. DietPi-Software | Added DietPi installation option for QuiteRSS: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=70#p2075 . Many thanks to Xenformation (JK) for his contributions on this. DietPi-Software | Added DietPi installation option for Cuberite (C++ Minecraft Server with web interface): http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=2069#p2068 DietPi-Software | Added DietPi installation option for MineOS (Java Minecraft Servers with web interface): http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=2069#p2069 DietPi-Software | FBturbo is now installed along with XSERVERXORG for Pine 64. Should improve 2D (eg: window) performance: https://github.com/Fourdee/DietPi/issues/380#issuecomment-226512966 DietPi-Software | HiFi (MPD + YMPD) is now available for ARM64 devices (eg: Odroid C2/Pine A64). DietPi-Config | You can now set your country code in "network options: adapters" menu, when running WiFi in hotspot mode (eg: dietpi-sofware > WiFi Hotspot installation). This will allow for channels 12/13 in some countries (eg: EU), and, increased power output (range) for the hotspot. DietPi-Config | RPi 3 internal WiFi is now disabled by default to save resources on new installs. It will automatically be enabled by DietPi if required. DietPi-Config | RPi 3 internal Bluetooth is now disabled by default to save resources on new installs. It can be enabled in the advanced menu. DietPi-Config | RPi 3 increased thermal limit from 65c to 75c. This should reduce the chance of users seeing the heat warning icon on-screen, whilst keeping the device below the 85c official thermal limit used in Raspbian: https://github.com/Fourdee/DietPi/issues/356#issuecomment-223282185 DietPi-Config | cfg80211 wifi module is now disabled by default to save resources on new installs. It will automatically be enabled by DietPi if required. DietPi-Config | bluetooth module is now disabled by default to save resources on new installs. It can be enabled in the advanced menu. DietPi-Config | Serial console is now disabled for all DietPi images (where possible): https://github.com/Fourdee/DietPi/issues/343#issuecomment-226946848 DietPi-Config | Corrected typos. Many thanks to Erkan-Yilmaz for spotting these: https://github.com/Fourdee/DietPi/pull/381 DietPi-Cloudshell | Added a feature which allows users to specify start and end times, where DietPi-Cloudshell will power off the screen and disable processing: https://github.com/Fourdee/DietPi/issues/379 DietPi-Backup | Now shows the most recent and successful backup date in main menu. DietPi-Sync | Now shows the most recent and successful sync date in main menu. Bug fixes: DietPi-Banner | Resolved an issue where delayed DHCP offers would not provide the IP address during boot: https://github.com/Fourdee/DietPi/issues/350#issuecomment-223273610 General | DietPi desktop items icon will now show correctly. DietPi-Automation | Updated missing software automation entries in dietpi.txt. Many thanks for K-plan for his input on this: https://github.com/Fourdee/DietPi/issues/374 DietPi-Software | Resolved an issue where Transmission would not start the web interface during boot (:9091), when using DHCP: https://github.com/Fourdee/DietPi/issues/350 DietPi-Software | Resolved an issue where VIFM and MTRTINY would not be flagged as installed, after the installation. Many thanks to K-plan for spotting this one: https://github.com/Fourdee/DietPi/issues/373 | https://github.com/Fourdee/DietPi/issues/374#issuecomment-225436379 DietPi-Software | Kodi has been disabled for Pine64 (non-functional) whilst we wait for working mali/mali_drm driver: https://github.com/Fourdee/DietPi/issues/380 DietPi-Config | Resolved an issue where the RPi3 internal wifi would still be active after being disabled: https://github.com/Fourdee/DietPi/issues/376 Many thanks to K-plan for reporting this. DietPi-Backup | Resolved an issue where search results, did not provide the most recent and successful backup date. DietPi-Sync | Now contains the correct program name in the backtitle.
MichaIng · Jun 24, 2016 · 9d263b8 · 9d263b8
2 parents 862b4d5 + 90c3588
commit 9d263b8
Show file tree

Hide file tree

Showing 33 changed files with 2,182 additions and 648 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,49 @@
+v120
+(xx/06/16)
+
+Important Information:
+Raspberry Pi Wheezy | Support for Raspberry Pi Wheezy has now finished. I have uploaded a final Wheezy DietPi image which users must install if they want to continue using Wheezy. Please see here for more information: http://dietpi.com/phpbb/viewtopic.php?f=9&t=432
+Image Downloads | All DietPi image downloads have been updated to v120. This includes all firmware/kernel/modules updates where applicable. http://dietpi.com/download
+
+Changes / Improvements / Optimizations:
+DietPi-Software > User Data | You can now setup a dedicated USB drive at any stage, on the fly : https://github.com/Fourdee/DietPi/issues/377
+DietPi-Software > User Data | When changing user data location, DietPi will automatically move your existing data and setup required symlinks.
+DietPi-Software > User Data | You can now force Flash or USB drive user data locations on the fly, disabling the automatic setting.
+DietPi-Software > User Data | /mnt/dietpi_userdata will now always point to your user data location, even if its custom.
+DietPi-Software | Added DietPi installation option for Mate Desktop: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2073 . Many thanks to Xenformation (JK) for his contributions on this.
+DietPi-Software | Added DietPi installation option for GNUstep Desktop:  http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2072 . Many thanks to Xenformation (JK) for his contributions on this.
+DietPi-Software | Added DietPi installation option for NoMachine:  http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=60#p2071 . Many thanks to Xenformation (JK) for his contributions on this.
+DietPi-Software | Added DietPi installation option for XRDP: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=70#p2074 . Many thanks to Xenformation (JK) for his contributions on this.
+DietPi-Software | Added DietPi installation option for QuiteRSS: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&start=70#p2075 . Many thanks to Xenformation (JK) for his contributions on this.
+DietPi-Software | Added DietPi installation option for Cuberite (C++ Minecraft Server with web interface): http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=2069#p2068
+DietPi-Software | Added DietPi installation option for MineOS (Java Minecraft Servers with web interface): http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=2069#p2069
+DietPi-Software | FBturbo is now installed along with XSERVERXORG for Pine 64. Should improve 2D (eg: window) performance: https://github.com/Fourdee/DietPi/issues/380#issuecomment-226512966
+DietPi-Software | HiFi (MPD + YMPD) is now available for ARM64 devices (eg: Odroid C2/Pine A64).
+DietPi-Config | You can now set your country code in "network options: adapters" menu, when running WiFi in hotspot mode (eg: dietpi-sofware > WiFi Hotspot installation). This will allow for channels 12/13 in some countries (eg: EU), and, increased power output (range) for the hotspot.
+DietPi-Config | RPi 3 internal WiFi is now disabled by default to save resources on new installs. It will automatically be enabled by DietPi if required.
+DietPi-Config | RPi 3 internal Bluetooth is now disabled by default to save resources on new installs. It can be enabled in the advanced menu.
+DietPi-Config | RPi 3 increased thermal limit from 65c to 75c. This should reduce the chance of users seeing the heat warning icon on-screen, whilst keeping the device below the 85c official thermal limit used in Raspbian: https://github.com/Fourdee/DietPi/issues/356#issuecomment-223282185
+DietPi-Config | cfg80211 wifi module is now disabled by default to save resources on new installs. It will automatically be enabled by DietPi if required.
+DietPi-Config | bluetooth module is now disabled by default to save resources on new installs. It can be enabled in the advanced menu.
+DietPi-Config | Serial console is now disabled for all DietPi images (where possible): https://github.com/Fourdee/DietPi/issues/343#issuecomment-226946848
+DietPi-Config | Corrected typos. Many thanks to Erkan-Yilmaz for spotting these: https://github.com/Fourdee/DietPi/pull/381
+DietPi-Cloudshell | Added a feature which allows users to specify start and end times, where DietPi-Cloudshell will power off the screen and disable processing: https://github.com/Fourdee/DietPi/issues/379
+DietPi-Backup | Now shows the most recent and successful backup date in main menu.
+DietPi-Sync | Now shows the most recent and successful sync date in main menu.
+
+Bug fixes:
+DietPi-Banner | Resolved an issue where delayed DHCP offers would not provide the IP address during boot: https://github.com/Fourdee/DietPi/issues/350#issuecomment-223273610
+General | DietPi desktop items icon will now show correctly.
+DietPi-Automation | Updated missing software automation entries in dietpi.txt. Many thanks for K-plan for his input on this: https://github.com/Fourdee/DietPi/issues/374
+DietPi-Software | Resolved an issue where Transmission would not start the web interface during boot (:9091), when using DHCP: https://github.com/Fourdee/DietPi/issues/350
+DietPi-Software | Resolved an issue where VIFM and MTRTINY would not be flagged as installed, after the installation. Many thanks to K-plan for spotting this one: https://github.com/Fourdee/DietPi/issues/373 | https://github.com/Fourdee/DietPi/issues/374#issuecomment-225436379
+DietPi-Software | Kodi has been disabled for Pine64 (non-functional) whilst we wait for working mali/mali_drm driver: https://github.com/Fourdee/DietPi/issues/380
+DietPi-Config | Resolved an issue where the RPi3 internal wifi would still be active after being disabled: https://github.com/Fourdee/DietPi/issues/376 Many thanks to K-plan for reporting this.
+DietPi-Backup | Resolved an issue where search results, did not provide the most recent and successful backup date.
+DietPi-Sync | Now contains the correct program name in the backtitle.
+
+-----------------------------------------------------------------------------------------------------------
+
 v119
 (01/06/16)
 

diff --git a/README.md b/README.md
@@ -9,14 +9,15 @@
 - Feature rich configuration tool for your device with dietpi-config.
 
 #### Find out more: http://dietpi.com
+#### Download image: http://dietpi.com/download
 
 ##### DietPi is available for:
 - Raspberry Pi's: http://dietpi.com
 - Odroid C1: http://dietpi.com/phpbb/viewtopic.php?f=8&t=11
 - Odroid C2: http://dietpi.com/phpbb/viewtopic.php?f=8&t=339&p=1492#p1492
 - ODroid XU3/4: http://dietpi.com/phpbb/viewtopic.php?f=8&t=57
 - Orange Pi PC: http://dietpi.com/phpbb/viewtopic.php?f=8&t=164#p612
-- BananaPi M2+:
+- BananaPi M2+: http://dietpi.com/phpbb/viewtopic.php?f=8&t=431
 - VMware x64 (Virtual Machine): http://dietpi.com/phpbb/viewtopic.php?f=8&t=90
 - VirtualBox x64 (Virtual Machine): http://dietpi.com/phpbb/viewtopic.php?f=8&t=390&p=1683#p1683
 

diff --git a/boot_c1.ini b/boot_c1.ini
@@ -41,7 +41,7 @@ setenv vpu "0"
 setenv hdmioutput "1"
 
 # Default Console Device Setting
-setenv condev "console=tty0 console=ttyS0,115200n8"
+setenv condev "console=tty0"
 
 ###########################################
 

diff --git a/boot_c2.ini b/boot_c2.ini
@@ -23,7 +23,7 @@ setenv hpd "true"
 # setenv hpd "false"
 
 # Default Console Device Setting
-setenv condev "console=tty0 console=ttyS0,115200n8"
+setenv condev "console=tty0"
 
 # Meson Timer
 # 1 - Meson Timer

diff --git a/boot_xu4.ini b/boot_xu4.ini
@@ -10,7 +10,7 @@ setenv macaddr "00:1e:06:61:7a:72"
 #------------------------------------------------------------------------------------------------------
 # Basic Ubuntu Setup. Don't touch unless you know what you are doing.
 # --------------------------------
-setenv bootrootfs "console=tty1 console=ttySAC2,115200n8 root=UUID=e139ce78-9841-40fe-8823-96a304a09859 rootwait ro fsck.repair=yes"
+setenv bootrootfs "console=tty1 root=UUID=e139ce78-9841-40fe-8823-96a304a09859 rootwait ro fsck.repair=yes"
 
 # boot commands
 setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu3.dtb; bootz 0x40008000 0x42000000 0x44000000"

diff --git a/dietpi.txt b/dietpi.txt
@@ -54,6 +54,8 @@ AUTO_Install_Index=0
 #DietPi-Optimized Software to automatically install | Requires AUTO_Install_Index=1
 #   1=install
 AUTO_DietpiSoftware_Install_DESKTOP_LXDE=0
+AUTO_DietpiSoftware_Install_DESKTOP_MATE=0
+AUTO_DietpiSoftware_Install_DESKTOP_GNUSTEP=0
 AUTO_DietpiSoftware_Install_TIGHTVNCSERVER=0
 AUTO_DietpiSoftware_Install_VNC4SERVER=0
 AUTO_DietpiSoftware_Install_OWNCLOUD=0
@@ -115,6 +117,10 @@ AUTO_DietpiSoftware_Install_MUMBLESERVER=0
 AUTO_DietpiSoftware_Install_EMBYSERVER=0
 AUTO_DietpiSoftware_Install_OPENBAZAAR=0
 AUTO_DietpiSoftware_Install_PLEXMEDIASERVER=0
+AUTO_DietpiSoftware_Install_XRDP=0
+AUTO_DietpiSoftware_Install_NOMACHINE=0
+AUTO_DietpiSoftware_Install_CUBERITE=0
+AUTO_DietpiSoftware_Install_MINEOS=0
 
 
 #Linux Additional Software to automatically install | Requires AUTO_Install_Index=1
@@ -132,6 +138,18 @@ AUTO_DietpiSoftware_Install_XSERVERXORG=0
 AUTO_DietpiSoftware_Install_FFMPEG=0
 AUTO_DietpiSoftware_Install_ORACLEJAVA=0
 AUTO_DietpiSoftware_Install_NODEJS=0
+AUTO_DietpiSoftware_Install_VIFM=0
+AUTO_DietpiSoftware_Install_QUITERSS=0
+AUTO_DietpiSoftware_Install_GNUEMACS=0
+AUTO_DietpiSoftware_Install_JED=0
+AUTO_DietpiSoftware_Install_VIMTINY=0
+AUTO_DietpiSoftware_Install_MIDNIGHTCOMMANDER=0
+AUTO_DietpiSoftware_Install_IFTOP=0
+AUTO_DietpiSoftware_Install_IPTRAF=0
+AUTO_DietpiSoftware_Install_IPERF=0
+AUTO_DietpiSoftware_Install_MTRTINY=0
+AUTO_DietpiSoftware_Install_NLOAD=0
+AUTO_DietpiSoftware_Install_TCPDUMP=0
 AUTO_DietpiSoftware_Install_LOGGING_RSYSLOG=0
 
 #DietPi-Software Choice System
@@ -244,8 +262,8 @@ wifi_hotspot_channel=3
 #WiFi country code. 2 character value (eg GB US DE JP): https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 wifi_country_code=
 
-#Serial Console: If you dont know what this is, you can safely disable it (=0) to reduce system resource usage.
-serial_console_enabled=1
+#Serial Console: Set to 1 if you require a serial console during 1st run of DietPi.
+serial_console_enabled=0
 
 #Soundcard
 soundcard=none
@@ -256,7 +274,7 @@ soundcard=none
 #------------------------------------------------------------------------------------------------------
 #Override target directory for user/personal data.
 #This is applied to software configurations when installing software (eg: owncloud, bittorrent downloads etc).
-#  Auto = Automatic (default). If USB dedicated drive was setup /mnt/usb_1, else, /root
+#  Auto = Automatic (default). If USB dedicated drive was setup /mnt/usb_1, else, /mnt/dietpi_userdata
 #  /mnt/Where/I/Want/My/Data = Example
 #  /mnt/user_data = Example
 dietpi_userdata_basedirectory=Auto

diff --git a/dietpi/.version b/dietpi/.version
@@ -1 +1 @@
-119
+120
diff --git a/dietpi/boot b/dietpi/boot
@@ -19,6 +19,8 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	#Globals
 	#/////////////////////////////////////////////////////////////////////////////////////
+	FP_LOGFILE='/var/log/dietpi-boot.log'
+
 	HW_MODEL=0
 	DISTRO=0
 
@@ -61,6 +63,8 @@
 					sed -i '/arm_freq=/c\#arm_freq=1200' /DietPi/config.txt
 					sed -i '/core_freq=/c\#core_freq=400' /DietPi/config.txt
 					sed -i '/sdram_freq=/c\#sdram_freq=400' /DietPi/config.txt
+					sed -i "/temp_limit=/c\temp_limit=75" /DietPi/config.txt # https://github.com/Fourdee/DietPi/issues/356
+
 				fi
 
 			fi
@@ -133,6 +137,10 @@ _EOF_
 			#Set Key
 			sed -i "/wireless-key/c\wireless-key $Wifi_KEY" /etc/network/interfaces
 			sed -i "/wpa-psk/c\wpa-psk $Wifi_KEY" /etc/network/interfaces
+
+			#Enable wifi modules
+			/DietPi/dietpi/func/dietpi-set_wifi_bt wifi 1
+
 		# - Ethernet
 		elif (( $Ethernet_Enabled == 1 )); then
 			#Enable Eth, disable Wlan
@@ -181,8 +189,35 @@ _EOF_
 			ifup eth"$index_eth"
 		fi
 
-		#Update network details
-		/DietPi/dietpi/func/obtain_network_details
+		#Wait for active connection, then update network details file
+		Wait_For_Valid_Network_Connection
+
+	}
+
+	Wait_For_Valid_Network_Connection(){
+
+		#Attempt to wait for a valid network connection
+		local max_loops=10
+		local loop_count=0
+		while true
+		do
+
+			if (( $loop_count >= $max_loops )); then
+				echo -e "$(date) | Valid connection wait timed out." >> "$FP_LOGFILE"
+				break
+			elif (( ! $(route | awk '{print $4}' | grep -ci -m1 'UG') )); then
+				echo -e "$(date) | Waiting for valid connection." >> "$FP_LOGFILE"
+				sleep 1
+			else
+				# - Update network details (for IP in dietpi-banner etc..)
+				echo -e "$(date) | Valid connection found." >> "$FP_LOGFILE"
+				/DietPi/dietpi/func/obtain_network_details
+				break
+			fi
+
+			((loop_count++))
+
+		done
 
 	}
 
@@ -218,13 +253,12 @@ _EOF_
 		/DietPi/dietpi/func/obtain_network_details
 		#----------------------------------------------------------------
 		#Disable RPi hdmi output if set in dietpi.txt
-		if (( $HW_MODEL < 10 )); then
+		if (( $HW_MODEL < 10 &&
+			$(cat /DietPi/dietpi.txt | grep -ci -m1 '^rpi_hdmi_output=0'))); then
 
 			#FBset value below allows for reduced memory bandwidth usage from VideoCore (eg: Faster RAM bandwidth/performance)
-			if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 'rpi_hdmi_output=0') == 1 )); then
-				fbset -xres 16 -yres 16 -vxres 16 -vyres 16 -depth 8 &> /dev/null
-				/opt/vc/bin/tvservice -o &> /dev/null
-			fi
+			fbset -xres 16 -yres 16 -vxres 16 -vyres 16 -depth 8 &> /dev/null
+			/opt/vc/bin/tvservice -o &> /dev/null
 
 		fi
 		#----------------------------------------------------------------
@@ -248,8 +282,11 @@ _EOF_
 	#Normal Boot
 	if (( $DIETPI_INSTALL_STAGE == 1 )); then
 
-		if (( $( cat /DietPi/dietpi.txt | grep -ci -m1 'dietpi_check_for_updates=1') == 1 )); then
+		Wait_For_Valid_Network_Connection
+
+		if (( $( cat /DietPi/dietpi.txt | grep -ci -m1 '^dietpi_check_for_updates=1') )); then
 			#Check for DietPi updates (+thread)
+			echo -e "$(date) | +Thread: checking for DietPi-Updates" >> "$FP_LOGFILE"
 			/DietPi/dietpi/dietpi-update 2 &> /dev/null &
 		fi
 
@@ -268,13 +305,13 @@ _EOF_
 		/DietPi/dietpi/func/change_hostname "$(cat /DietPi/dietpi.txt | grep -m1 '^Hostname=' | sed 's/.*=//')"
 
 		#Automation - Set auto login for next bootup
-		if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^AUTO_AutoLogin=1') == 1 )); then
+		if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^AUTO_AutoLogin=1') )); then
 			/DietPi/dietpi/dietpi-autostart 7
 		fi
 
-		#Disable serial console? (enabled by default)
-		if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^serial_console_enabled=0') )); then
-			/DietPi/dietpi/dietpi-set_serialconsole -1
+		#Enable serial console?
+		if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^serial_console_enabled=1') )); then
+			/DietPi/dietpi/func/dietpi-set_serialconsole 1
 		fi
 
 		echo -e " Expanding SD/Flash partition. Please wait..."

diff --git a/dietpi/conf/desktop/.gtk-bookmarks b/dietpi/conf/desktop/.gtk-bookmarks
@@ -1,5 +1,6 @@
 file:/// /
 file:///root /root
+file:///mnt/dietpi_userdata DietPi User Data
 file:///mnt/usb_1 USB Drive
 file:///mnt/samba Samba Client
 file:///mnt/ftp_client FTP Client
diff --git a/dietpi/conf/desktop/dietpi-icon.png b/dietpi/conf/desktop/dietpi-icon.png
diff --git a/dietpi/conf/desktop/kodi-icon.png b/dietpi/conf/desktop/kodi-icon.png
diff --git a/dietpi/conf/mpd.conf b/dietpi/conf/mpd.conf
@@ -1,8 +1,8 @@
 #/etc/mpd.conf
 
-music_directory					"/mnt/usb_1/Music"
-playlist_directory				"/mnt/usb_1/Music"
-db_file							"/mnt/usb_1/.mpd_cache/db_file"
+music_directory					"/mnt/dietpi_userdata/Music"
+playlist_directory				"/mnt/dietpi_userdata/Music"
+db_file							"/mnt/dietpi_userdata/.mpd_cache/db_file"
 log_file						"/var/log/mpd/mpd.log"
 pid_file						"/var/run/mpd/pid"
 state_file						"/var/lib/mpd/state"
@@ -36,8 +36,8 @@ input {
 }
 
 replaygain						"track"
-#replaygain_preamp				"0"
-volume_normalization			"no"
+replaygain_preamp				"8"
+volume_normalization			"yes"
 
 #audio_buffer_size				"2048"
 #buffer_before_play				"10%"

diff --git a/dietpi/dietpi-autostart b/dietpi/dietpi-autostart
@@ -86,7 +86,7 @@ _EOF_
 			"0" "Console: Manual Login (default)"
 			"7" "Console: Automatic Login"
 			"1" "Kodi"
-			"2" "LXDE: Desktop"
+			"2" "Desktop (LXDE/MATE etc)"
 			"3" "RetroPie"
 			"4" "OpenTyrian"
 			"5" "DietPi-Cloudshell"
@@ -139,4 +139,4 @@ _EOF_
 	#-----------------------------------------------------------------------------------
 	exit
 	#-----------------------------------------------------------------------------------
-}
+}
diff --git a/dietpi/dietpi-backup b/dietpi/dietpi-backup
@@ -46,9 +46,13 @@
 	#TARGETMENUID=0
 	Menu_Main(){
 
+		local backup_last_completed='No previous backup found. Create one.'
+		if [ -f "$FP_TARGET/$BACKUP_STATS_FILENAME" ]; then
+			backup_last_completed=$(grep '^Backup Completed' "$FP_TARGET/$BACKUP_STATS_FILENAME" | tail -1 | awk '{print $3}')
+		fi
 
-		WHIP_TITLE='--- DietPi-Backup ---'
-		OPTION=$(whiptail --title "$WHIP_TITLE" --menu "Current backup and restore location:\n\n$FP_TARGET" --cancel-button "Exit" --backtitle "$WHIP_BACKTITLE" 14 73 4 \
+		WHIP_TITLE='- DietPi-Backup -'
+		OPTION=$(whiptail --title "$WHIP_TITLE" --menu "Current backup and restore location:\n  $FP_TARGET\n\nMost recent successful backup date:\n  $backup_last_completed" --cancel-button "Exit" --backtitle "$WHIP_BACKTITLE" 16 73 4 \
 		"Help" "What does DietPi-Backup do?" \
 		"Location" "Change where your backup will be saved and restored from." \
 		"Backup" "Create (or update) a backup of this system." \
@@ -130,7 +134,7 @@
 						local search_results_whiptail=()
 						for ((i=0; i<${#search_results_list[@]}; i++))
 						do
-							local last_backup_date=$( sed -n 1p ${search_results_list[$i]} | awk '{print $3}' ) # Date of last backup for this backup
+							local last_backup_date=$( grep '^Backup Completed' ${search_results_list[$i]} | tail -1 | awk '{print $3}' ) # Date of last backup for this backup
 							local backup_directory=$( echo -e ${search_results_list[$i]} | sed 's/\/'"$BACKUP_STATS_FILENAME"'//g' ) # Backup directory (minus the backup file), that we can use for target backup directory.
 							search_results_whiptail+=("$backup_directory" ": $last_backup_date")
 						done

diff --git a/dietpi/dietpi-bugreport b/dietpi/dietpi-bugreport
@@ -195,6 +195,12 @@ _EOF_
 		zip "$zip_settings" "$FILE_GENERATED_ZIP" /etc/apt/sources.list
 		zip "$zip_settings" "$FILE_GENERATED_ZIP" /etc/apt/sources.list.d/*
 
+		#locale
+		locale > locale.txt
+		zip "$zip_settings" "$FILE_GENERATED_ZIP" /locale.txt
+		rm locale.txt
+
+
 	}