Skip to content

Use bash for mkdisk.sh to have pushd and popd #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muelli wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use bash for mkdisk.sh to have pushd and popd #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe5870
Use bash for mkdisk.sh to have pushd and popd
muelli Aug 31, 2023
5c6e8ff
detect syslinux directory for ubuntu
muelli Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions utils/mkdisk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

IMAGE_SIZE_G=100
BOOTSTRAP_SIZE_G=2
Expand Down Expand Up @@ -127,8 +127,17 @@ cp "${ROOTFS_DIR}/usr/share/syslinux/mbr.bin" "${FS_DIR}/syslinux/"
# TODO can't use these as they might not be compatible with the host's guestfish installing syslinux
#cp ./root3/usr/share/syslinux/linux.c32 .
#cp ./root3/usr/share/syslinux/libcom32.c32 .
cp /usr/lib/syslinux/bios/linux.c32 "${FS_DIR}/syslinux/"
cp /usr/lib/syslinux/bios/libcom32.c32 "${FS_DIR}/syslinux/"
if test -d /usr/lib/syslinux/modules/bios/; then
SYSLINUXDIR=/usr/lib/syslinux/modules/bios/
elif test -d /usr/lib/syslinux/bios/; then
SYSLINUXDIR=/usr/lib/syslinux/bios/
else
echo "WARNING! syslinux dir not detected, assuming /usr/lib/syslinux/bios/"
SYSLINUXDIR=/usr/lib/syslinux/bios/
fi

cp "$SYSLINUXDIR/linux.c32" "${FS_DIR}/syslinux/"
cp "$SYSLINUXDIR/libcom32.c32" "${FS_DIR}/syslinux/"

cat <<EOF > "${FS_DIR}/syslinux/syslinux.cfg"
DEFAULT linux
Expand Down