rebase with master

alternative.platforms/README.md

@@ -18,7 +18,7 @@ Specifications of the tested hardware: [hw_comparison.md](hw_comparison.md)
 All testers are welcome. Open an issue for your specific board to collaborate and share your experience.
 
 ---
-## Armbian
+## Armbian Stretch
 Many SBC-s are supported:
 https://www.armbian.com/download/
 
@@ -40,12 +40,13 @@ Continue with building the SDcard: https://github.com/rootzoll/raspiblitz#build-
 
 ---
 
-## Ubuntu
+## Ubuntu Bionic
 
 A common distro to be supplied by the manufacturer for various boards.
 
 Tested on:
 * Odroid XU4 with ubuntu-18.04.1-4.14-minimal image from https://de.eu.odroid.in/ubuntu_18.04lts/XU3_XU4_MC1_HC1_HC2
+* Nvidia Jetson Nano with Ubuntu Bionic image from https://developer.nvidia.com/embedded/learn/get-started-jetson-nano-devkit#write
 
 Burn the image to the SDCard with [Etcher](https://www.balena.io/etcher/).
 

build_sdcard.sh

@@ -62,6 +62,7 @@ isDietPi=$(uname -n | grep -c 'DietPi')
 isRaspbian=$(cat /etc/os-release 2>/dev/null | grep -c 'Raspbian')
 isArmbian=$(cat /etc/os-release 2>/dev/null | grep -c 'Debian')
 isUbuntu=$(cat /etc/os-release 2>/dev/null | grep -c 'Ubuntu')
+isNvidia=$(uname -a | grep -c 'tegra')
 if [ ${isRaspbian} -gt 0 ]; then
   baseImage="raspbian"
 fi
@@ -148,6 +149,12 @@ if [ "${baseImage}" = "ubuntu" ] || [ "${baseImage}" = "armbian" ]; then
   sudo adduser pi sudo
 fi
 
+# special prepare when Nvidia Jetson Nano 
+if [ ${isNvidia} -eq 1 ] ; then
+  # disable GUI on boot
+  sudo systemctl set-default multi-user.target
+fi
+
 echo ""
 echo "*** CONFIG ***"
 # based on https://github.com/Stadicus/guides/blob/master/raspibolt/raspibolt_20_pi.md#raspi-config
@@ -273,6 +280,7 @@ sudo apt install -y sysbench
 # check for dependencies on DietPi, Ubuntu, Armbian
 sudo apt-get install -y build-essential
 sudo apt-get install -y python-pip
+sudo apt-get install -y python-dev
 # rsync is needed to copy from HDD
 sudo apt install -y rsync
 # install ifconfig
@@ -288,6 +296,7 @@ sudo apt install -y openssh-client
 sudo apt install -y openssh-sftp-server
 # install killall, fuser
 sudo apt-get install -y psmisc
+
 sudo apt-get clean
 sudo apt-get -y autoremove
 

home.admin/00raspiblitz.sh

@@ -20,6 +20,7 @@ if [ ${hddExists} -eq 0 ]; then
     echo "Press ENTER to create a Partition - or CTRL+C to abort"
     read key
     echo "Creating Partition ..."
+    sudo parted -s /dev/sda mklabel msdos
     sudo parted -s /dev/sda unit s mkpart primary `sudo parted /dev/sda unit s print free | grep 'Free Space' | tail -n 1`
     echo "DONE."
     sleep 3

home.admin/_bootstrap.sh

@@ -508,7 +508,7 @@ if [ "${baseImage}" = "raspbian" ] ; then
   sed -i "s/^state=.*/state=stresstest/g" ${infoFile}
   sed -i "s/^message=.*/message='Testing Hardware 60s'/g" ${infoFile}
   sudo /home/admin/config.scripts/blitz.stresstest.sh /home/admin/stresstest.report
-
-  echo "DONE BOOTSTRAP" >> $logFile
-  exit 0
 fi
+
+echo "DONE BOOTSTRAP" >> $logFile
+exit 0

home.admin/config.scripts/blitz.stresstest.sh

@@ -7,6 +7,12 @@ if [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  exit 1
 fi
 
+isRaspbian=$(cat /etc/os-release 2>/dev/null | grep -c 'Raspbian')
+if [ ${isRaspbian} -eq 0 ]; then
+  echo "the OS is not Raspbian - the stresstest is only for the Raspberry Pi"
+  exit 0
+fi
+
 # Based on https://github.com/bamarni/pi64/issues/4#issuecomment-292707581
 # sysbench manual: http://imysql.com/wp-content/uploads/2014/10/sysbench-manual.pdf
 

home.admin/config.scripts/internet.tor.sh

@@ -12,6 +12,33 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  exit 1
 fi
 
+echo "Detect Base Image ..." 
+baseImage="?"
+isDietPi=$(uname -n | grep -c 'DietPi')
+isRaspbian=$(cat /etc/os-release 2>/dev/null | grep -c 'Raspbian')
+isArmbian=$(cat /etc/os-release 2>/dev/null | grep -c 'Debian')
+isUbuntu=$(cat /etc/os-release 2>/dev/null | grep -c 'Ubuntu')
+if [ ${isRaspbian} -gt 0 ]; then
+  baseImage="raspbian"
+fi
+if [ ${isArmbian} -gt 0 ]; then
+  baseImage="armbian"
+fi 
+if [ ${isUbuntu} -gt 0 ]; then
+baseImage="ubuntu"
+fi
+if [ ${isDietPi} -gt 0 ]; then
+  baseImage="dietpi"
+fi
+if [ "${baseImage}" = "?" ]; then
+  cat /etc/os-release 2>/dev/null
+  echo "!!! FAIL !!!"
+  echo "Base Image cannot be detected or is not supported."
+  exit 1
+else
+  echo "OK running ${baseImage}"
+fi
+
 # function: install keys & sources
 prepareTorSources()
 {
@@ -29,8 +56,13 @@ prepareTorSources()
     echo ""
  
     echo "*** Adding Tor Sources to sources.list ***"
+    if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "armbian" ] || [ "${baseImage}" = "dietpi" ]; then
       echo "deb https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
       echo "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
+    elif [ "${baseImage}" = "ubuntu" ]; then
+      echo "deb https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list
+      echo "deb-src https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list    
+    fi
     echo "OK"
     echo ""
 }

shoppinglist_it.md

@@ -2,7 +2,7 @@
 
 * RaspBerry Pi 3: https://www.amazon.it/dp/B07BDR5PDW/
 * Micro SD-Card 32GB: https://www.amazon.it/dp/B07CY3QSST
-* Power: https://www.amazon.it/dp/B01566WOAG
+* Power: https://www.amazon.it/dp/B01JZE38QE
 * 1TB Hard Drive: https://www.amazon.it/dp/B07997KKSK
 * Heatsink-Case: https://www.amazon.it/dp/B07KYCNF1D
 * LCD-Display: https://www.amazon.it/dp/B06ZZBL1C4