Merge pull request #2316 from Fourdee/dev

Dev > Beta

CHANGELOG.txt

@@ -1,9 +1,9 @@
 
 v6.19
-(xx/12/18)
+(04/12/18)
 
 Changes / Improvements / Optimisations:
-- General | ASUS TB: Updated to mainline kernel, with midgard r13 GPU driver. Now supports hardware accelleration and support for Kodi.
+- General | ASUS TB: Image updated to mainline kernel, with midgard r13 GPU driver. Now supports hardware accelleration and support for Kodi. Please download the image to enable these features.
 - General | RPi 3A+: Added hardware code enabling correct naming of device throughout DietPi: https://github.com/Fourdee/DietPi/issues/2301
 - DietPi-Software | Renamed several software config files to have a consistent naming scheme: https://github.com/Fourdee/DietPi/pull/2312
 - DietPi-Software | LXDE: Applied updated DietPi theme and wallpaper. For new installations only.
@@ -15,6 +15,7 @@ Changes / Improvements / Optimisations:
 
 Bug Fixes:
 - General | Asus TB (based on our recent 2.0.8 Tinker OS pre-image): Resolved issue with corrupt characters in desktops.
+- DietPi-Update | Prevented backup prompt during each subversion patch from displaying.
 - DietPi-Software | Chromium: Resolved incorrect scale of window under Kiosk mode: https://github.com/Fourdee/DietPi/issues/2298#issuecomment-442995196
 - DietPi-Software | OMPD: Resolved a reinstall issue due to SQL table not being correctly dropped, before re-created: https://github.com/Fourdee/DietPi/issues/2305
 - DietPi-Autostart | XU4: Resolved an issue with startx failing during boot: https://github.com/Fourdee/DietPi/issues/2130#issuecomment-443475525

PREP_SYSTEM_FOR_DIETPI.sh

@@ -349,7 +349,7 @@
 			'52' ': ASUS Tinker Board'
 			'10' ': Odroid C1'
 			'12' ': Odroid C2'
-			'11' ': Odroid XU3/4/HC1/HC2'
+			'11' ': Odroid XU3/XU4/HC1/HC2'
 			'44' ': Pinebook 1080p'
 			'0' ': Raspberry Pi (All models)'
 			# '1' ': Raspberry Pi 1/Zero (512mb)'

dietpi/dietpi-software

@@ -7303,7 +7303,7 @@ _EOF_
 
 			G_BACKUP_FP /etc/nginx/nginx.conf
 			dps_index=$software_id Download_Install 'nginx.conf' /etc/nginx/nginx.conf
-			# Adjust socket name to PHP version 
+			# Adjust socket name to PHP version
 			if (( $G_DISTRO < 4 )); then
 
 				sed -i 's#/run/php/php7.0-fpm.sock#/run/php5-fpm.sock#g' /etc/nginx/nginx.conf
@@ -7370,8 +7370,6 @@ _EOF_
 			mv /var/www/html/index.lighttpd.html /var/www/
 			[[ $(ls -A /var/www/html 2>&1) ]] || rm -R /var/www/html
 
-			service lighttpd force-reload
-
 		fi
 
 		#WEBSERVER_PHP
@@ -7986,7 +7984,6 @@ url.redirect = (
 					lighttpd-enable-mod dietpi-dav_redirect
 
 				fi
-				service lighttpd force-reload
 
 			elif (( ${aSOFTWARE_INSTALL_STATE[85]} > 0 )); then
 
@@ -12367,6 +12364,13 @@ _EOF_
 
 		fi
 
+		#------------------------------------------------------------------
+		# - Webservers reload configs, so reboot is not required to load them.
+		[[ $(which lighttpd) ]] && G_RUN_CMD systemctl force-reload lighttpd
+		[[ $(which nginx) ]] && G_RUN_CMD systemctl force-reload nginx
+		[[ $(which apache2) ]] && G_RUN_CMD systemctl force-reload apache2
+		#------------------------------------------------------------------
+
 	}
 
 	Install_Apply_GPU_Settings(){

dietpi/server_version-6

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