v6.0

+ fix: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-357515055
Fourdee · Jan 14, 2018 · 4e10e8b · 4e10e8b
1 parent ece3097
commit 4e10e8b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -97,6 +97,12 @@ export LC_ALL="en_GB.UTF-8"
 export LANGUAGE="en_GB:en"
 _EOF_
 	chmod +x /etc/profile.d/99-dietpi-force-locale.sh
+	#. /etc/profile.d/99-dietpi-force-locale.sh
+		# root@nanopineo:~# . /etc/profile.d/99-dietpi-force-locale.sh
+		# -bash: warning: setlocale: LC_ALL: cannot change locale (en_GB.UTF-8)
+		# root@nanopineo:~# localectl set-locale LANG="en_GB.UTF-8"
+		# root@nanopineo:~# localectl set-locale LC_ALL="en_GB.UTF-8"
+		# Failed to issue method call: Invalid Locale data.
 
 	#Force en_GB Locale for rest of script. Prevents incorrect parsing with non-english locales.
 	LANG=en_GB.UTF-8
@@ -622,7 +628,7 @@ _EOF_
 		G_AGI device-tree-compiler #Kern
 
 
-	# - Auto detect kernel package
+	# - Auto detect kernel/firmware package
 	else
 
 		AUTO_DETECT_KERN_PKG=$(dpkg --get-selections | grep '^linux-image' | awk '{print $1}')
@@ -637,6 +643,21 @@ _EOF_
 
 		fi
 
+		#	Check for existing firmware
+		#	- ARMbian
+		# AUTO_DETECT_FIRMWARE_PKG=$(dpkg --get-selections | grep '^armbian-firmware' | awk '{print $1}')
+		# if [ -n "$AUTO_DETECT_FIRMWARE_PKG" ]; then
+
+			# G_AGI $AUTO_DETECT_FIRMWARE_PKG
+
+		# fi
+
+		# Unpacking armbian-firmware (5.35) ...
+		# dpkg: error processing archive /var/cache/apt/archives/armbian-firmware_5.35_all      .deb (--unpack):
+		# trying to overwrite '/lib/firmware/rt2870.bin', which is also in package firmwa      re-misc-nonfree 20161130-3
+		# dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
+
+
 	fi
 
 	G_DIETPI-NOTIFY 2 "WiFi selection"

diff --git a/dietpi/dietpi-obtain_hw_model b/dietpi/dietpi-obtain_hw_model
@@ -602,15 +602,15 @@
 		fi
 
 		#Get Distro Index
-		if (( $( grep -ci -m1 'jessie' /etc/*release) )); then
+		if (( $( grep -ci -m1 'jessie' /etc/os-release) )); then
 
 			G_DISTRO=3
 
-		elif (( $( grep -ci -m1 'stretch' /etc/*release) )); then
+		elif (( $( grep -ci -m1 'stretch' /etc/os-release) )); then
 
 			G_DISTRO=4
 
-		elif (( $( grep -ci -m1 'buster' /etc/*release) )); then
+		elif (( $( grep -ci -m1 'buster' /etc/os-release) )); then
 
 			G_DISTRO=5