Make armbian variant work again #162

guysoft · guysoft · commit 462fbadc89c8 · 2022-03-20T16:57:10.000+02:00
diff --git a/src/modules/network/start_chroot_script b/src/modules/network/start_chroot_script
@@ -19,7 +19,7 @@ DIST_NETWORK_FILE=/"${BASE_BOOT_MOUNT_PATH}"/${DIST_NAME,,}-wpa-supplicant.txt
 # allow configuring multiple wifi networks via /boot/DIST_NAME-wpa-supplicant.txt
 mv /"${BASE_BOOT_MOUNT_PATH}"/custompios-wpa-supplicant.txt ${DIST_NETWORK_FILE}
 
-if [ "${BASE_DISTRO}" == "ubuntu" ]; then
+if [ "${BASE_DISTRO}" == "ubuntu" ] || [ "${BASE_DISTRO}" == "armbian" ]; then
     echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev" > /etc/wpa_supplicant/wpa_supplicant.conf
     echo "update_config=1" >> /etc/wpa_supplicant/wpa_supplicant.conf
 fi
diff --git a/src/variants/armbian/config b/src/variants/armbian/config
@@ -1,7 +1,8 @@
 VARIANT_CONFIG_DIR=$(realpath -s $(dirname $(realpath -s $BASH_SOURCE))/../..)
-BASE_ZIP_IMG=`ls -t ${DIST_PATH}/image-variants/*.{zip,7z} | head -n 1`
+BASE_ZIP_IMG=`ls -t ${DIST_PATH}/image-variants/*.{zip,7z,xz} | head -n 1`
 BASE_APT_CACHE=no
 OCTOPI_INCLUDE_WIRINGPI=no
+export BASE_DISTRO=armbian
 # The root partiton of the image filesystem, 2 for raspbian, 1 for armbian
 BASE_ROOT_PARTITION=1
 BASE_IMAGE_RESIZEROOT=500
diff --git a/src/variants/armbian/pre_chroot_script b/src/variants/armbian/pre_chroot_script
@@ -52,15 +52,10 @@ if [ -n "$BASE_APT_CACHE" ] && [ "$BASE_APT_CACHE" != "no" ]; then
 else
   apt-get clean
 fi
-apt-get update --allow-releaseinfo-change
+apt-get update || true
 apt-get -y --force-yes install avahi-daemon || true
-apt-get -y --force-yes install python python-distutils-extra || true
-apt-get -y --force-yes install -f
-wget https://bootstrap.pypa.io/get-pip.py -O - | python
 apt-get -y --force-yes install iptables
-pip install virtualenv --upgrade
 
 mkdir -p /var/run/wpa_supplicant
 
-apt-get remove -y python-pip python3-pip
 
