Fixes for armbian changes

eazrael · Aug 4, 2024 · 82832dc · 82832dc
1 parent 84b1df7
commit 82832dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/config/boards/artilleryx4-emmc.conf b/config/boards/artilleryx4-emmc.conf
@@ -34,13 +34,13 @@ PACKAGE_LIST_BOARD="xterm file iotop-c i2c-tools spi-tools"
 PACKAGE_LIST_BOARD_REMOVE="linux-dtb-current-rockchip64"
 REPOSITORY_INSTALL="armbian-config armbian-firmware"
 INSTALL_HEADERS="yes" # install kernel headers package
-
+NETWORKING_STACK="network-manager"
 
 function post_family_tweaks__artillerxy_some_tweaks() {
-    display_alert "$BOARD" "Disabling ramlog" "info"
-    chroot_sdcard systemctl disable armbian-ramlog
-
-    display_alert "$BOARD" "Disabling default device trees" "info"
+    display_alert "${BOARD}"  "Disabling default device trees" "info"
     chroot_sdcard apt-mark hold linux-dtb-current-rockchip64
-	return 0
+
+    display_alert "${BOARD}" "Disabling resizing filesyste on first boot" "info"
+    chroot_sdcard touch /root/.no_rootfs_resize
+    return 0
 }
diff --git a/config/boards/artilleryx4.conf b/config/boards/artilleryx4.conf
@@ -34,12 +34,13 @@ PACKAGE_LIST_BOARD="xterm file iotop-c i2c-tools spi-tools"
 PACKAGE_LIST_BOARD_REMOVE="linux-dtb-current-rockchip64"
 REPOSITORY_INSTALL="armbian-config armbian-firmware"
 INSTALL_HEADERS="yes" # install kernel headers package
+NETWORKING_STACK="network-manager"
 
 function post_family_tweaks__artillerxy_some_tweaks() {
-    display_alert "$BOARD" "Disabling ramlog" "info"
-    chroot_sdcard systemctl disable armbian-ramlog
+    display_alert "${BOARD}"  "Disabling ramlog" "info"
+    chroot_sdcard systemctl mask armbian-ramlog
 
-    display_alert "$BOARD" "Disabling default device trees" "info"
+    display_alert "${BOARD}"  "Disabling default device trees" "info"
     chroot_sdcard apt-mark hold linux-dtb-current-rockchip64
 	return 0
 }
diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages
@@ -1,6 +1,8 @@
 alsa-utils
 bash-completion
 bc
+chrony
+
 console-setup
 cron
 curl
@@ -27,6 +29,8 @@ man-db
 mmc-utils
 ncurses-term
 nano
+netplan.io
+network-manager
 openssh-server
 parted
 psmisc
@@ -38,6 +42,7 @@ toilet
 tzdata
 u-boot-tools
 usbutils
+vlan
 wget
 wireless-tools
 wireguard-tools

diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional
@@ -20,10 +20,12 @@ flex
 git
 gpiod
 gnupg2
+haveged
 hdparm
 htop
 html2text
 i2c-tools
+ifenslave
 iotop
 iperf3
 iptables
@@ -50,6 +52,7 @@ screen
 software-properties-common
 smartmontools
 stress
+sudo
 sysfsutils
 sysstat
 unattended-upgrades