v159

DietPi-Backup | "Full Backup" Mode is now the default for fresh DietPi installations. This is mainly due to MySQL data now being in the DietPi userdata directory. DietPi-Config | Tools > Benchmarks: Added ability to benchmark CPU performance based on bash + integer: https://github.com/Fourdee/DietPi/issues/1253#issuecomment-346881878
MichaIng · Nov 24, 2017 · 6b51b81 · 6b51b81
1 parent e574f01
commit 6b51b81
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,7 +5,8 @@ Changes / Improvements / Optimizations:
 General | Odroid XU3/4 images updated: Includes kernel support for EMMC 5.1 (thanks Meveric): https://github.com/Fourdee/DietPi/issues/1252
 General | DietPi RPi kernel: Updated to 4.9.62.
 General | DietPi RPi kernel: Will no longer re-install, if the current version is already at latest.
-DietPi-Config | Tools > Benchmarks: Added ability to benchmark CPU performance using sysbench: https://github.com/Fourdee/DietPi/issues/1253#issuecomment-346441545
+DietPi-Backup | "Full Backup" Mode is now the default for fresh DietPi installations. This is mainly due to MySQL data now being in the DietPi userdata directory.
+DietPi-Config | Tools > Benchmarks: Added ability to benchmark CPU performance based on bash + integer: https://github.com/Fourdee/DietPi/issues/1253#issuecomment-346881878
 DietPi-Config | Time sync modes: NTP is now uninstalled when SystemD timedatectl is enabled. Reinstalled on demand. Timedatectl pool servers are now also set: https://github.com/Fourdee/DietPi/issues/1208#issuecomment-343762480
 DietPi-Software | APT log: Moved to /etc/dietpi/logs/dietpi-software_apt.log, to prevent RAMlog clearing log during automated installations.
 DietPi-Software | MPD (Stretch): Install updated to 0.20.11. Also supports native DSD playback (thanks to @sudeep and PJotr), when "Native" output freq/bit is set: https://github.com/Fourdee/DietPi/issues/1236
@@ -14,7 +15,7 @@ DietPi-Software | Nextcloud: Correct database access issue for MariaDB + minor f
 DietPi-Software | ownCloud: Installation fixed, respecting different distro repos: https://github.com/Fourdee/DietPi/pull/1243
 
 Bug Fixes:
-DietPi-Config | Nvidia driver: nouveau now disabled during install, fix for 750Ti and possibily other Nvidia chipsets (thanks dubyazero): https://github.com/Fourdee/DietPi/issues/1244
+DietPi-Config | Nvidia driver: nouveau now disabled by default on x86_64, fix for 750Ti and possibily other Nvidia chipsets (thanks dubyazero): https://github.com/Fourdee/DietPi/issues/1244
 DietPi-Software | Redis: Minor un/installation/activation fixes of PHP module (Thanks to @MichaIng) : https://github.com/Fourdee/DietPi/pull/1249
 
 

diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -532,6 +532,20 @@ tput cnorm
 _EOF_
 #???
 
+#??? x86_64
+#	Disable nouveau: https://github.com/Fourdee/DietPi/issues/1244 // http://dietpi.com/phpbb/viewtopic.php?f=11&t=2462&p=9688#p9688
+cat << _EOF_ > /etc/modprobe.d/blacklist-nouveau.conf
+blacklist nouveau
+blacklist lbm-nouveau
+options nouveau modeset=0
+alias nouveau off
+alias lbm-nouveau off
+_EOF_
+echo -e "options nouveau modeset=0" > /etc/modprobe.d/nouveau-kms.conf
+update-initramfs -u
+#???
+
+
 #------------------------------------------------------------------------------------------------
 #A Unique HW_MODEL index will need to be assigned and coded into the DietPi sourcecode.
 # If you are not creating a pull request for this, then:

diff --git a/dietpi/dietpi-backup b/dietpi/dietpi-backup
@@ -307,7 +307,7 @@
 	# Backup System
 	#/////////////////////////////////////////////////////////////////////////////////////
 	RSYNC_MODE_TEXT=0
-	BACKUP_MODE=0 #0=system only, 1=full (system and userdata)
+	BACKUP_MODE=1 #0=system only, 1=full (system and userdata)
 
 	#LOGFILE
 	LOGFILE='/var/log/dietpi-backup.log'

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -7878,19 +7878,6 @@ _EOF_
 
 			Banner_Installing
 
-			#Disable nouveau: https://github.com/Fourdee/DietPi/issues/1244
-			cat << _EOF_ > /etc/modprobe.d/blacklist-nouveau.conf
-blacklist nouveau
-blacklist lbm-nouveau
-options nouveau modeset=0
-alias nouveau off
-alias lbm-nouveau off
-_EOF_
-
-			echo -e "options nouveau modeset=0" | tee -a /etc/modprobe.d/nouveau-kms.conf
-
-			update-initramfs -u
-
 			#Install
 			AGI nvidia-driver nvidia-xconfig
 
@@ -13311,8 +13298,6 @@ _EOF_
 		elif (( $1 == 151 )); then
 
 			AGP nvidia-driver nvidia-xconfig libgl1-nvidia-glx:i386
-			rm /etc/modprobe.d/blacklist-nouveau.conf
-			sed -i '/^options nouveau modeset=0/d' /etc/modprobe.d/nouveau-kms.conf
 
 		elif (( $1 == 152 )); then
 

diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -2769,7 +2769,7 @@ _EOF_
 		#Reinstalls
 		#	Squeezelite / Shairport-sync
 		/DietPi/dietpi/dietpi-software reinstall 36 37
-		#-------------------------------------------------------------------------------	
+		#-------------------------------------------------------------------------------
 		#WiFi module disable powersave addition:
 		echo -e "options wlan_8192eu rtw_power_mgnt=0" > /etc/modprobe.d/wlan_8192eu.conf
 		#-------------------------------------------------------------------------------
@@ -2827,6 +2827,24 @@ _EOF_
 
 		fi
 		#-------------------------------------------------------------------------------
+		#x86_64, blacklist by nouveau default, prefer Nvidia driver installer
+		#	Disable nouveau: https://github.com/Fourdee/DietPi/issues/1244 // http://dietpi.com/phpbb/viewtopic.php?f=11&t=2462&p=9688#p9688
+		if (( $HW_ARCH == 10 )); then
+
+			cat << _EOF_ > /etc/modprobe.d/blacklist-nouveau.conf
+blacklist nouveau
+blacklist lbm-nouveau
+options nouveau modeset=0
+alias nouveau off
+alias lbm-nouveau off
+_EOF_
+
+			echo -e "options nouveau modeset=0" > /etc/modprobe.d/nouveau-kms.conf
+
+			update-initramfs -u
+
+		fi
+		#-------------------------------------------------------------------------------
 
 	fi