From 4ec85dfafd9778baa7bd73503e087184276655bf Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Mon, 29 Feb 2016 20:25:50 +0100 Subject: [PATCH 1/3] Add extended/continuous logging to armhwinfo. Enhanced user documentation regarding locale --- documentation/user-faq.md | 5 ++++- scripts/armhwinfo | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/documentation/user-faq.md b/documentation/user-faq.md index 99bb2b733c..201694e04c 100644 --- a/documentation/user-faq.md +++ b/documentation/user-faq.md @@ -156,9 +156,12 @@ keyboard: dpkg-reconfigure keyboard-configuration -system language: +system language: + # Debian --> https://wiki.debian.org/ChangeLanguage dpkg-reconfigure locales + # Ubuntu --> https://help.ubuntu.com/community/Locale + update-locale LANG=[options] && dpkg-reconfigure locales console font, codepage: diff --git a/scripts/armhwinfo b/scripts/armhwinfo index 85794f2992..891ab7de47 100644 --- a/scripts/armhwinfo +++ b/scripts/armhwinfo @@ -13,6 +13,8 @@ if [ "X$1" != "Xstart" ]; then exit 1 fi +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + create_motd_warning() { cat > /etc/update-motd.d/90-warning < /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 +cat /proc/version >>/var/log/armhwinfo.log +cat "${TMPFILE}" >>/var/log/armhwinfo.log +lsusb -v >>/var/log/armhwinfo.log +lscpu >>/var/log/armhwinfo.log +cat /proc/cpuinfo >>/var/log/armhwinfo.log +cat /proc/meminfo >>/var/log/armhwinfo.log +cat /proc/interrupts >>/var/log/armhwinfo.log +ifconfig >>/var/log/armhwinfo.log +df -h >>/var/log/armhwinfo.log From f5ebec1f77e1073bd2d98a7dfd45101807e3550e Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Mon, 29 Feb 2016 22:10:04 +0100 Subject: [PATCH 2/3] 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 From 8644413afdf69ca0356f5808ba5a4fe5eb7ec083 Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Tue, 1 Mar 2016 06:38:10 +0100 Subject: [PATCH 3/3] Update H3 Mini FAQ --- documentation/H3_mini_faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/H3_mini_faq.md b/documentation/H3_mini_faq.md index 028834340a..5294b77c66 100644 --- a/documentation/H3_mini_faq.md +++ b/documentation/H3_mini_faq.md @@ -21,7 +21,7 @@ Armbian supports starting with release 5.04 all available H3 based Orange Pi boa ***Known issues with 5.04*** -- It seems auto detection for the Orange Pi 2 doesn't work properly. Please have a look [in the forum](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5718). Will be fixed in 5.05 if we ever get feedback (otherwise image for Orange Pi 2 will be withdrawn +- Auto detection for the Orange Pi 2 doesn't work properly. Please have a look [for a manual fix](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5718) or wait for 5.05 where this will be fixed - Mali acceleration currently only working for root user. Please apply [a fix](http://forum.armbian.com/index.php/topic/617-wip-orange-pi-one-support-for-the-upcoming-orange-pi-one/?p=5719) manually or wait for 5.05 to fix this ***Important to know***