diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 4d996d0..945c9b2 100644 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -3,7 +3,7 @@ # Set globals TMPDIR=/var/tmp/manjaro-arm-installer ARCH='aarch64' -NSPAWN='sudo systemd-nspawn --timezone=off -D' +NSPAWN='sudo systemd-nspawn -q --resolv-conf=copy-host --timezone=off -D' # clearing variables DEVICE="" @@ -114,10 +114,6 @@ create_install() { $NSPAWN $TMPDIR/root systemctl enable systemd-networkd.service getty.target haveged.service dhcpcd.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable $SRV_EDITION 1> /dev/null 2>&1 - if [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]]; then - $NSPAWN $TMPDIR/root systemctl enable amlogic.service 1> /dev/null 2>&1 - fi - msg "Applying overlay for $EDITION..." sudo cp -ap $TMPDIR/arm-profiles/overlays/$EDITION/* $TMPDIR/root/ @@ -156,7 +152,7 @@ create_install() { echo "audio_pwm_mode=2" | sudo tee --append $TMPDIR/root/boot/config.txt echo "/dev/mmcblk0p1 /boot vfat defaults 0 0" | sudo tee --append $TMPDIR/root/etc/fstab elif [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]]; then - echo "No device setups for $DEVICE..." + $NSPAWN $TMPDIR/root systemctl enable amlogic.service 1> /dev/null 2>&1 elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then echo "No device setups for $DEVICE..." elif [[ "$DEVICE" = "pinebook" ]]; then @@ -219,8 +215,8 @@ prepare_card () { sudo chmod 777 -R $TMPDIR/root sudo mount ${SDCARD}1 $TMPDIR/root - # For pinebook device - elif [[ "$DEVICE" = "pinebook" ]]; then + # For pine devices + elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then #Clear first 8mb sudo dd if=/dev/zero of=${SDCARD} bs=1M count=8 1> /dev/null 2>&1 @@ -237,14 +233,14 @@ prepare_card () { sudo mount ${SDCARD}1 $TMPDIR/root # For rockpro64 device - elif [[ "$DEVICE" = "rockpro64" ]]; then + elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then #Clear first 8mb - sudo dd if=/dev/zero of=${SDCARD} bs=1M count=8 1> /dev/null 2>&1 + sudo dd if=/dev/zero of=${SDCARD} bs=1M count=32 1> /dev/null 2>&1 #partition with a single root partition sudo parted -s $SDCARD mklabel msdos 1> /dev/null 2>&1 - sudo parted -s $SDCARD mkpart primary ext4 0% 100% 1> /dev/null 2>&1 + sudo parted -s $SDCARD mkpart primary ext4 32M 100% 1> /dev/null 2>&1 sudo partprobe $SDCARD 1> /dev/null 2>&1 sudo mkfs.ext4 -O ^metadata_csum,^64bit ${SDCARD}1 1> /dev/null 2>&1 @@ -281,7 +277,7 @@ cleanup () { sudo partprobe $SDCARD 1> /dev/null 2>&1 # For pinebook device - elif [[ "$DEVICE" = "pinebook" ]]; then + elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then #flash bootloader sudo dd if=$TMPDIR/root/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} bs=8k seek=1 1> /dev/null 2>&1 @@ -292,7 +288,7 @@ cleanup () { # For rockpro64 device - elif [[ "$DEVICE" = "rockpro64" ]]; then + elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then #flash bootloader sudo dd if=$TMPDIR/root/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1 sudo dd if=$TMPDIR/root/boot/uboot.img of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1 @@ -313,6 +309,8 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \ "rpi3" "Raspberry Pi 3" \ "oc2" "Odroid C2" \ "pinebook" "Pinebook" \ + "sopine" "Sopine/Pine64-LTS" \ + "rock64" "Rock64" \ "rpi2" "Raspberry Pi 2 (unmaintained)" \ "oc1" "Odroid C1/C1+ (unmaintained)" \ "xu4" "Odroid XU4 (unmaintained)" 3>&1 1>&2 2>&3 3>&-)