v142

+ More patch tweaks.

PREP_SYSTEM_FOR_DIETPI.sh

@@ -129,10 +129,10 @@ apt-get install -y apt-transport-https ethtool p7zip-full hfsplus iw debconf-uti
 #??? NanoPi Neo Air 3.x kernel only (and possibily other ap62xx chipsets), required for ap6212 bt firmware service: https://github.com/Fourdee/DietPi/issues/602#issuecomment-262806470
 apt-get install rfkill
 
-#??? bluetooth if onboard device
+#??? bluetooth if onboard device / RPI
 apt-get install -y bluetooth
 
-#??? RPi - bluetooth/firmware for RPi 3
+#??? RPi - bluetooth/firmware for RPi 3 (ALL)
 apt-get install -y pi-bluetooth
 #??? RPi - common rpi specific binaries (eg: raspistill)
 apt-get install -y libraspberrypi-bin

dietpi/patch_file

@@ -2143,17 +2143,10 @@ _EOF_
 		#RPi 3 Bluetooth packages missing: https://github.com/Fourdee/DietPi/issues/693
 		if (( $HW_MODEL < 10 )); then
 
-			# - Check if currently installed/enabled
-			DISABLE_BT=0
-			if (( ! $(dpkg --get-selections | grep -ci -m1 '^bluetooth') )); then
-
-				DISABLE_BT=1
-
-			fi
-
 			apt-get install -y pi-bluetooth --reinstall
 
-			if (( $DISABLE_BT )); then
+			# - Check if previously disabled, and reapply
+			if [ -f /etc/modprobe.d/disable_bt.conf ]; then
 
 				/DietPi/dietpi/func/dietpi-set_hardware bluetooth disable
 
@@ -2180,7 +2173,11 @@ _EOF_
 		fi
 		#-------------------------------------------------------------------------------
 		#Alsamixer fix, reapply current soundcard with updated asound.conf: https://github.com/Fourdee/DietPi/issues/705
-		/DietPi/dietpi/func/dietpi-set_hardware soundcard $(cat /DietPi/dietpi.txt | grep -m1 'soundcard=' | sed 's/.*=//')
+		if [ -f /DietPi/dietpi/.installed ]; then
+
+			/DietPi/dietpi/func/dietpi-set_hardware soundcard $(cat /DietPi/dietpi.txt | grep -m1 'soundcard=' | sed 's/.*=//')
+
+		fi
 		#-------------------------------------------------------------------------------
 		#RPi, install common rpi specific binaries by default (eg: raspistill)
 		if (( $HW_MODEL < 10 )); then