armbian fix

Author: luxflow

src/variants/armbian/config

@@ -3,7 +3,7 @@ BASE_ZIP_IMG=`ls -t ${DIST_PATH}/image-variants/*.{zip,7z} | head -n 1`
 BASE_APT_CACHE=no
 OCTOPI_INCLUDE_WIRINGPI=no
 # The root partiton of the image filesystem, 2 for raspbian, 1 for armbian
-BASE_ROOT_PARTITION=1
-BASE_IMAGE_RESIZEROOT=500
+BASE_ROOT_PARTITION=2
+BASE_IMAGE_ENLARGEROOT=500
 BASE_IMAGE_RASPBIAN=no
 BASE_IMAGE_ENLARGEROOT=1000

src/variants/armbian/filesystem/root/etc/network/interfaces

@@ -9,13 +9,13 @@ source-directory /etc/network/interfaces.d
 auto lo
 iface lo inet loopback
 
-iface eth0 inet manual
+iface eth0 inet dhcp
 
 allow-hotplug wlan0
-iface wlan0 inet manual
+iface wlan0 inet dhcp
     wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
 
 allow-hotplug wlan1
-iface wlan1 inet manual
+iface wlan1 inet dhcp
     wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
 

src/variants/armbian/pre_chroot_script

@@ -28,7 +28,14 @@ if_group_exists_run(){
     fi
 }
 
-
+# disable armbian based network config
+# https://github.com/armbian/build/blob/master/packages/bsp/common/usr/lib/armbian/armbian-firstrun-config
+systemctl disable armbian-firstrun-config
+rm /boot/armbian_first_run.txt.template
+# disable NetworkManager use /etc/network instead
+systemctl disable NetworkManager
+# disable first-login add user https://github.com/armbian/build/blob/master/packages/bsp/common/etc/profile.d/armbian-check-first-login.sh
+rm /etc/profile.d/armbian-check-first-login.sh
 
 password=$(perl -e 'printf("%s\n", crypt($ARGV[0], "password"))' "raspberry")
 useradd -m -p "${password}" -s /bin/bash pi