From 52967f77e717de0fcaad9c44da1e684d0fa8d3fd Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 8 Jan 2025 14:23:43 -0600 Subject: [PATCH] ubuntu rootfs: 23.04 (lunar) -> 24.04 (noble lts) Signed-off-by: Robert Nelson --- 06_generate_ubuntu_console_root.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/06_generate_ubuntu_console_root.sh b/06_generate_ubuntu_console_root.sh index f96d4ef..8e6a4f6 100755 --- a/06_generate_ubuntu_console_root.sh +++ b/06_generate_ubuntu_console_root.sh @@ -11,16 +11,16 @@ wdir=`pwd` if [ -f /tmp/latest ] ; then rm -rf /tmp/latest | true fi -wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/ubuntu-riscv64-23.04-minimal/latest || true +wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/ubuntu-riscv64-24.04-minimal/latest || true if [ -f /tmp/latest ] ; then latest_rootfs=$(cat "/tmp/latest") datestamp=$(cat "/tmp/latest" | awk -F 'riscv64-' '{print $2}' | awk -F '.' '{print $1}') - if [ ! -f ./deploy/ubuntu-23.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-lunar.tar ] ; then + if [ ! -f ./deploy/ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar ] ; then if [ -f ./.gitlab-runner ] ; then - wget -c --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/ubuntu-riscv64-23.04-minimal/${datestamp}/${latest_rootfs} + wget -c --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/ubuntu-riscv64-24.04-minimal/${datestamp}/${latest_rootfs} else - wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/ubuntu-riscv64-23.04-minimal/${datestamp}/${latest_rootfs} + wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/ubuntu-riscv64-24.04-minimal/${datestamp}/${latest_rootfs} fi cd ./deploy/ tar xf ${latest_rootfs} @@ -36,8 +36,8 @@ if [ -d ./ignore/.root ] ; then fi mkdir -p ./ignore/.root -echo "Extracting: ubuntu-23.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-lunar.tar" -tar xfp ./deploy/ubuntu-23.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-lunar.tar -C ./ignore/.root +echo "Extracting: ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar" +tar xfp ./deploy/ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar -C ./ignore/.root sync mkdir -p ./deploy/input/ || true @@ -75,9 +75,6 @@ cp -v ./ignore/.root/etc/bbb.io/templates/nginx/nginx-autoindex ./ignore/.root/e cp -v ./ignore/.root/etc/bbb.io/templates/nginx/*.html ./ignore/.root/var/www/html/ rm -f ./ignore/.root/var/www/html/index.nginx-debian.html || true -#Ubuntu Lunar is eol, switch to old-release for testing... -sed -i -e 's:ports.ubuntu.com:old-releases.ubuntu.com/ubuntu:g' ./ignore/.root/etc//apt/sources.list - if [ -f ./deploy/.modules ] ; then version=$(cat ./deploy/.modules || true) if [ -f ./deploy/${version}-modules.tar.gz ] ; then