From b6d39d82004ca0767ad68ae2a9e1e9761a09c2b8 Mon Sep 17 00:00:00 2001
From: Andrei Radulescu <andi.radulescu@gmail.com>
Date: Sat, 9 Dec 2023 23:27:10 +0200
Subject: [PATCH] ubuntu 22.04

---
 Dockerfile.agnos        |  2 +-
 build_system.sh         |  4 ++--
 userspace/base_setup.sh | 21 ++++++++++-----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index 0c65441..f40a20d 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -2,7 +2,7 @@
 # ###### Base ###### #
 # ################## #
 FROM scratch AS agnos-base
-ADD ubuntu-base-20.04.1-base-arm64.tar.gz /
+ADD ubuntu-base-22.04-base-arm64.tar.gz /
 
 # Add aarch64 and arm support
 COPY --from=multiarch/qemu-user-static:x86_64-aarch64 /usr/bin/qemu-aarch64-static /usr/bin
diff --git a/build_system.sh b/build_system.sh
index f8fda71..fe002e3 100755
--- a/build_system.sh
+++ b/build_system.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-UBUNTU_BASE_URL="http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release"
-UBUNTU_FILE="ubuntu-base-20.04.1-base-arm64.tar.gz"
+UBUNTU_BASE_URL="http://cdimage.ubuntu.com/ubuntu-base/releases/22.04/release"
+UBUNTU_FILE="ubuntu-base-22.04-base-arm64.tar.gz"
 
 export DOCKER_BUILDKIT=1
 
diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index 28ef1cf..4d6eef4 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -8,6 +8,14 @@ HOST=comma
 touch /TICI
 touch /AGNOS
 
+# Add armhf as supported architecture
+dpkg --add-architecture armhf
+
+# Install packages
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -yq locales systemd adduser
+
 # Create privileged user
 useradd -G sudo -m -s /bin/bash $USERNAME
 echo "$USERNAME:$PASSWD" | chpasswd
@@ -21,14 +29,6 @@ adduser $USERNAME gpu
 adduser $USERNAME audio
 adduser $USERNAME disk
 adduser $USERNAME dialout
-
-# Add armhf as supported architecture
-dpkg --add-architecture armhf
-
-# Install packages
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get install -yq locales systemd
 adduser $USERNAME systemd-journal
 
 # Enable serial console on UART
@@ -85,8 +85,6 @@ apt-get install --no-install-recommends -yq \
     network-manager \
     nvme-cli \
     openssl \
-    python-dev \
-    python-setuptools \
     smartmontools \
     speedtest-cli \
     ssh \
@@ -112,8 +110,9 @@ echo "makestep 0.1 3" >> /etc/chrony/chrony.conf
 mkdir /data && chown $USERNAME:$USERNAME /data
 mkdir /persist && chown $USERNAME:$USERNAME /persist
 
+# TODO: this is from 20.04, does it have a replacement?
 # Disable automatic ondemand switching from ubuntu
-systemctl disable ondemand
+#systemctl disable ondemand
 
 # Disable pstore service that moves files out of /sys/fs/pstore
 systemctl disable systemd-pstore.service