From f5ebec1f77e1073bd2d98a7dfd45101807e3550e Mon Sep 17 00:00:00 2001
From: Thomas Kaiser <github@kaiser-edv.de>
Date: Mon, 29 Feb 2016 22:10:04 +0100
Subject: [PATCH] Fixed OPi 2 auto detection with ugly hack, extended
 armhwinfo's logging

---
 scripts/armhwinfo | 15 ++++++++++++++-
 scripts/firstrun  | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/scripts/armhwinfo b/scripts/armhwinfo
index 891ab7de47..cb0c056ce5 100644
--- a/scripts/armhwinfo
+++ b/scripts/armhwinfo
@@ -203,13 +203,26 @@ echo -e "[\e[0;32m ok \x1B[0m] Starting ARM hardware info: $ID"
 echo $ID > /var/run/machine.id
 export HARDWARE DISTROID DISTROCODE ARCH KERNELID MACHINE ID
 
-echo -e "\n\n\n$(date) $HARDWARE $DISTROID $DISTROCODE $ARCH $KERNELID $MACHINE $ID" >>/var/log/armhwinfo.log
+if [ -f /var/log/armhwinfo.log ]; then
+	echo -e "\n\n\n$(date) $HARDWARE $DISTROID $DISTROCODE $ARCH $KERNELID $MACHINE $ID" >>/var/log/armhwinfo.log
+else
+	echo "$(date) $HARDWARE $DISTROID $DISTROCODE $ARCH $KERNELID $MACHINE $ID" >>/var/log/armhwinfo.log
+	chmod 755 /var/log/armhwinfo.log
+fi
 cat /proc/version >>/var/log/armhwinfo.log
+echo -e "\n### dmesg:\n" >>/var/log/armhwinfo.log
 cat "${TMPFILE}" >>/var/log/armhwinfo.log
+echo -e "\n### lsusb:" >>/var/log/armhwinfo.log
 lsusb -v >>/var/log/armhwinfo.log
+echo -e "\n### lscpu:\n" >>/var/log/armhwinfo.log
 lscpu >>/var/log/armhwinfo.log
+echo -e "\n### cpuinfo:\n" >>/var/log/armhwinfo.log
 cat /proc/cpuinfo >>/var/log/armhwinfo.log
+echo -e "\n### meminfo:\n" >>/var/log/armhwinfo.log
 cat /proc/meminfo >>/var/log/armhwinfo.log 
+echo -e "\n### interrupts:\n" >>/var/log/armhwinfo.log
 cat /proc/interrupts >>/var/log/armhwinfo.log
+echo -e "\n### ifconfig:\n" >>/var/log/armhwinfo.log
 ifconfig >>/var/log/armhwinfo.log
+echo -e "\n### df:\n" >>/var/log/armhwinfo.log
 df -h >>/var/log/armhwinfo.log
diff --git a/scripts/firstrun b/scripts/firstrun
index d5796a733a..944bd02d6d 100644
--- a/scripts/firstrun
+++ b/scripts/firstrun
@@ -112,9 +112,16 @@ autodetect_h3() {
 	# wait for armhwinfo
 	sleep 3
 	MACHINE="$(tail -n1 /run/machine.id)"
+	NEWHOSTNAME="$(echo "${MACHINE}" | tr '[:upper:]' '[:lower:]' | sed -e 's/+/plus/' -e 's/\ //g')"
+	ScriptBinName="$(echo "${NEWHOSTNAME}" | sed -e 's/2mini$/2/g' -e 's/plus2$/plus/g').bin"
+	ScriptBinUsed="$(readlink -f "/boot/script.bin")"
 	case ${MACHINE} in
 		"Orange Pi+"*)
-			ln -sf /boot/bin/orangepiplus.bin /boot/script.bin
+			if [ "X${ScriptBinName}" != "X${ScriptBinUsed##*/}" ]; then
+				# wrong detection due to disabled Ethernet on 1st boot
+				ln -sf /boot/bin/orangepi2.bin /boot/script.bin
+				NEWHOSTNAME="orangepi2"
+			fi
 			;;
 		"Orange Pi 2"*)
 			ln -sf /boot/bin/orangepi2.bin /boot/script.bin
@@ -132,8 +139,14 @@ autodetect_h3() {
 			sed -i -e 's/MIN_SPEED=480000/MIN_SPEED=648000/' \
 			-e 's/MAX_SPEED=1296000/MAX_SPEED=1200000/' /etc/default/cpufrequtils
 			;;
+		"Banana Pi M2+")
+			if [ "X${ScriptBinName}" != "X${ScriptBinUsed##*/}" ]; then
+				# wrong detection due to disabled Ethernet on 1st boot
+				ln -sf /boot/bin/orangepipc.bin /boot/script.bin
+				NEWHOSTNAME="orangepipc"
+			fi
+			;;
 	esac
-	NEWHOSTNAME="$(echo "${MACHINE}" | tr '[:upper:]' '[:lower:]' | sed -e 's/+/plus/' -e 's/\ //g')"
 	echo "${NEWHOSTNAME}" >/etc/hostname
 	sed -i "s/orangepih3/${NEWHOSTNAME}/" /etc/hosts
 	rm /boot/bin/orangepih3.bin