penguin
/
BeagleV-Fire-ubuntu
mirror of https://openbeagle.org/beaglev-fire/BeagleV-Fire-ubuntu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rootfs: more error checking, for when the base rootfs is corrupt

Browse Source 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
main
Robert Nelson 1 month ago
parent d2968647b3
commit 048a5491ce
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File

22
06_generate_debian_console_root.sh
Unescape Escape View File

@ -7,24 +7,33 @@ if ! id | grep -q root; then
fi fi
wdir=`pwd` wdir=`pwd`
distro="debian"
version="trixie"
codename="trixie"
if [ -f /tmp/latest ] ; then if [ -f /tmp/latest ] ; then
rm -rf /tmp/latest | true rm -rf /tmp/latest | true
fi fi
wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/debian-riscv64-trixie-minimal/latest || true wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/${distro}-riscv64-${version}-minimal/latest || true
if [ -f /tmp/latest ] ; then if [ -f /tmp/latest ] ; then
latest_rootfs=$(cat "/tmp/latest") latest_rootfs=$(cat "/tmp/latest")
datestamp=$(cat "/tmp/latest" | awk -F 'riscv64-' '{print $2}' | awk -F '.' '{print $1}') datestamp=$(cat "/tmp/latest" | awk -F 'riscv64-' '{print $2}' | awk -F '.' '{print $1}')
echo "${datestamp}"
if [ ! -f ./deploy/debian-trixie-console-riscv64-${datestamp}/riscv64-rootfs-debian-trixie.tar ] ; then if [ ! -f ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar ] ; then
echo "wget [${datestamp}/${latest_rootfs}]"
if [ -f ./.gitlab-runner ] ; then if [ -f ./.gitlab-runner ] ; then
wget -c --quiet --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/debian-riscv64-trixie-minimal/${datestamp}/${latest_rootfs} wget -c --quiet --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/${distro}-riscv64-${version}-minimal/${datestamp}/${latest_rootfs}
else else
wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/debian-riscv64-trixie-minimal/${datestamp}/${latest_rootfs} wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/${distro}-riscv64-${version}-minimal/${datestamp}/${latest_rootfs}
fi fi
cd ./deploy/ cd ./deploy/
tar xf ${latest_rootfs} tar xf ${latest_rootfs}
cd ../ cd ../
if [ ! -f ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar ] ; then
echo "Corrupted file?"
exit 2
fi
fi fi
else else
echo "Failure: getting image" echo "Failure: getting image"
@ -36,8 +45,8 @@ if [ -d ./ignore/.root ] ; then
fi fi
mkdir -p ./ignore/.root mkdir -p ./ignore/.root
echo "Extracting: debian-trixie-console-riscv64-${datestamp}/riscv64-rootfs-*.tar" echo "Extracting: ${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar"
tar xfp ./deploy/debian-trixie-console-riscv64-${datestamp}/riscv64-rootfs-*.tar -C ./ignore/.root tar xfp ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar -C ./ignore/.root
sync sync
mkdir -p ./deploy/input/ || true mkdir -p ./deploy/input/ || true
@ -93,3 +102,4 @@ mkfs.ext4 -F ./deploy/input/root.ext4 -d ./ignore/.root
if [ -f ./.06_generate_root.sh ] ; then if [ -f ./.06_generate_root.sh ] ; then
rm -f ./.06_generate_root.sh || true rm -f ./.06_generate_root.sh || true
fi fi
#

22
06_generate_ubuntu_console_root.sh
Unescape Escape View File

@ -7,24 +7,33 @@ if ! id | grep -q root; then
fi fi
wdir=`pwd` wdir=`pwd`
distro="ubuntu"
version="24.04"
codename="noble"
if [ -f /tmp/latest ] ; then if [ -f /tmp/latest ] ; then
rm -rf /tmp/latest | true rm -rf /tmp/latest | true
fi fi
wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/ubuntu-riscv64-24.04-minimal/latest || true wget --quiet --directory-prefix=/tmp/ https://rcn-ee.net/rootfs/${distro}-riscv64-${version}-minimal/latest || true
if [ -f /tmp/latest ] ; then if [ -f /tmp/latest ] ; then
latest_rootfs=$(cat "/tmp/latest") latest_rootfs=$(cat "/tmp/latest")
datestamp=$(cat "/tmp/latest" | awk -F 'riscv64-' '{print $2}' | awk -F '.' '{print $1}') datestamp=$(cat "/tmp/latest" | awk -F 'riscv64-' '{print $2}' | awk -F '.' '{print $1}')
echo "${datestamp}"
if [ ! -f ./deploy/ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar ] ; then if [ ! -f ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar ] ; then
echo "wget [${datestamp}/${latest_rootfs}]"
if [ -f ./.gitlab-runner ] ; then if [ -f ./.gitlab-runner ] ; then
wget -c --quiet --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/ubuntu-riscv64-24.04-minimal/${datestamp}/${latest_rootfs} wget -c --quiet --directory-prefix=./deploy http://192.168.1.98/mirror/rcn-ee.us/rootfs/${distro}-riscv64-${version}-minimal/${datestamp}/${latest_rootfs}
else else
wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/ubuntu-riscv64-24.04-minimal/${datestamp}/${latest_rootfs} wget -c --directory-prefix=./deploy https://rcn-ee.net/rootfs/${distro}-riscv64-${version}-minimal/${datestamp}/${latest_rootfs}
fi fi
cd ./deploy/ cd ./deploy/
tar xf ${latest_rootfs} tar xf ${latest_rootfs}
cd ../ cd ../
if [ ! -f ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar ] ; then
echo "Corrupted file?"
exit 2
fi
fi fi
else else
echo "Failure: getting image" echo "Failure: getting image"
@ -36,8 +45,8 @@ if [ -d ./ignore/.root ] ; then
fi fi
mkdir -p ./ignore/.root mkdir -p ./ignore/.root
echo "Extracting: ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar" echo "Extracting: ${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar"
tar xfp ./deploy/ubuntu-24.04-console-riscv64-${datestamp}/riscv64-rootfs-ubuntu-noble.tar -C ./ignore/.root tar xfp ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootfs-${distro}-${codename}.tar -C ./ignore/.root
sync sync
mkdir -p ./deploy/input/ || true mkdir -p ./deploy/input/ || true
@ -93,3 +102,4 @@ mkfs.ext4 -F ./deploy/input/root.ext4 -d ./ignore/.root
if [ -f ./.06_generate_root.sh ] ; then if [ -f ./.06_generate_root.sh ] ; then
rm -f ./.06_generate_root.sh || true rm -f ./.06_generate_root.sh || true
fi fi
#

Write Preview
Loading…
Cancel
Save