vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dja/bootstrap-fixes' into 'master'

Browse source 
Fixes for bootstrapping on Ubuntu Noble

See merge request redox-os/redox!1536
This commit is contained in:
Jeremy Soller 2025-01-07 00:14:37 +00:00
parent b1c9018fd4 e87739bc4a
commit 752910c5e4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
native_bootstrap.sh
View file

@ -421,6 +421,7 @@ ubuntu()
genisoimage \ genisoimage \
git \ git \
gperf \ gperf \
help2man \
intltool \ intltool \
libexpat-dev \ libexpat-dev \
libfuse3-dev \ libfuse3-dev \
@ -846,7 +847,7 @@ usage()
echo "------------------------" echo "------------------------"
echo "|Redox bootstrap script|" echo "|Redox bootstrap script|"
echo "------------------------" echo "------------------------"
echo "Usage: ./bootstrap.sh" echo "Usage: ./native_bootstrap.sh"
echo "OPTIONS:" echo "OPTIONS:"
echo echo
echo " -h,--help Show this prompt" echo " -h,--help Show this prompt"
@ -863,7 +864,7 @@ usage()
echo " package managers are supported." echo " package managers are supported."
echo "EXAMPLES:" echo "EXAMPLES:"
echo echo
echo "./bootstrap.sh -e qemu" echo "./native_bootstrap.sh -e qemu"
exit exit
} }
@ -982,7 +983,7 @@ boot()
echo "Creating .config with PODMAN_BUILD=0" echo "Creating .config with PODMAN_BUILD=0"
echo 'PODMAN_BUILD?=0' > redox/.config echo 'PODMAN_BUILD?=0' > redox/.config
echo "Cleaning up..." echo "Cleaning up..."
rm bootstrap.sh rm native_bootstrap.sh
echo echo
echo "---------------------------------------" echo "---------------------------------------"
echo "Well it looks like you are ready to go!" echo "Well it looks like you are ready to go!"

2
podman_bootstrap.sh
View file

@ -218,7 +218,7 @@ ubuntu()
sudo "$2" update sudo "$2" update
echo "Installing required packages..." echo "Installing required packages..."
sudo "$2" install \ sudo "$2" install \
podman curl git make fuse3 fuse-overlayfs slirp4netns podman curl git make pkg-config fuse3 libfuse3-dev fuse-overlayfs slirp4netns
if [ "$1" == "qemu" ]; then if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..." echo "Installing QEMU..."