From f221a684248676dc09980668c3ccf3d2eb550083 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Thu, 30 Apr 2026 18:22:54 -0700
Subject: [PATCH] cleanup base_setup.sh

---
 userspace/base_setup.sh | 78 +++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index e5bb4cb..340ec94 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -19,25 +19,9 @@ bash -c "$(curl -sL https://git.io/vokNn)"
 
 # Install packages
 export DEBIAN_FRONTEND=noninteractive
-apt-fast install --no-install-recommends -yq locales systemd adduser
-
-# Enable serial console on UART
-systemctl enable serial-getty@ttyS0.service
-
-# set kernel params
-echo "net.ipv4.conf.all.rp_filter = 2" >> /etc/sysctl.conf
-echo "vm.dirty_expire_centisecs = 200" >> /etc/sysctl.conf
-
-# raise comma user's process priority limits
-echo "comma - rtprio 100" >> /etc/security/limits.conf
-echo "comma - nice -10" >> /etc/security/limits.conf
-
-# Locale setup
-locale-gen en_US.UTF-8
-update-locale LANG=en_US.UTF-8
-
 apt-fast upgrade -yq
 apt-fast install --no-install-recommends -yq \
+    adduser \
     alsa-utils \
     apport-retrace \
     bc \
@@ -54,30 +38,45 @@ apt-fast install --no-install-recommends -yq \
     i2c-tools \
     ifmetric \
     ifupdown \
+    iputils-ping \
     iptables-persistent \
+    isc-dhcp-client \
     jq \
+    kmod \
     landscape-common \
+    libc6-dev \
+    libegl1 \
+    libegl-dev \
+    libffi-dev \
+    libgbm-dev \
+    libgdbm-dev \
+    libgles1 \
+    libgles2 \
+    libgles-dev \
+    libgtk2.0-dev \
     libi2c-dev \
-    libqmi-utils \
-    libtool \
     libncursesw5-dev \
     libnss-myhostname \
-    libgdbm-dev \
-    libc6-dev \
+    libqmi-utils \
     libsqlite3-dev \
     libssl-dev \
-    libffi-dev \
+    libtool \
+    libx264-dev \
+    locales \
     llvm \
     nano \
     net-tools \
     nload \
     network-manager \
     openssl \
+    openssh-server \
     ppp \
+    rsyslog \
     speedtest-cli \
     ssh \
     sshfs \
     sudo \
+    systemd \
     systemd-resolved \
     systemd-timesyncd \
     traceroute \
@@ -88,8 +87,24 @@ apt-fast install --no-install-recommends -yq \
     udhcpc \
     wget \
     wireless-tools \
+    wpasupplicant \
     zlib1g-dev
 
+# Enable serial console on UART
+systemctl enable serial-getty@ttyS0.service
+
+# set kernel params
+echo "net.ipv4.conf.all.rp_filter = 2" >> /etc/sysctl.conf
+echo "vm.dirty_expire_centisecs = 200" >> /etc/sysctl.conf
+
+# raise comma user's process priority limits
+echo "comma - rtprio 100" >> /etc/security/limits.conf
+echo "comma - nice -10" >> /etc/security/limits.conf
+
+# Locale setup
+locale-gen en_US.UTF-8
+update-locale LANG=en_US.UTF-8
+
 # Disable pstore service that moves files out of /sys/fs/pstore
 systemctl disable systemd-pstore.service
 
@@ -99,25 +114,6 @@ echo "comma ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 # setup /bin/sh symlink
 ln -sf /bin/bash /bin/sh
 
-# Install additional runtime packages
-apt-fast update -yq
-apt-fast install --no-install-recommends -yq \
-    libegl1 \
-    libegl-dev \
-    libgles1 \
-    libgles2 \
-    libgles-dev \
-    libx264-dev \
-    openssh-server \
-    dnsmasq-base \
-    isc-dhcp-client \
-    iputils-ping \
-    rsyslog \
-    kmod \
-    wpasupplicant \
-    hostapd \
-    libgtk2.0-dev
-
 # Create privileged user
 useradd -G sudo -m -s /bin/bash $USERNAME
 echo "$USERNAME:$PASSWD" | chpasswd