Skip to content
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

fix make_image.sh and mount_image.sh for macOS #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix make_image.sh and mount_image.sh for macOS #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions devenv/make_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,24 @@ qemu-img create -f raw $DISK_IMG 200M
mkfs.fat -n 'MIKAN OS' -s 2 -f 2 -R 32 -F 32 $DISK_IMG

$DEVENV_DIR/mount_image.sh $DISK_IMG $MOUNT_POINT
sudo mkdir -p $MOUNT_POINT/EFI/BOOT
sudo cp $EFI_FILE $MOUNT_POINT/EFI/BOOT/BOOTX64.EFI
if [ `uname` = 'Darwin' ]; then
mkdir -p $MOUNT_POINT/EFI/BOOT
cp $EFI_FILE $MOUNT_POINT/EFI/BOOT/BOOTX64.EFI
else
sudo mkdir -p $MOUNT_POINT/EFI/BOOT
sudo cp $EFI_FILE $MOUNT_POINT/EFI/BOOT/BOOTX64.EFI
fi
if [ "$ANOTHER_FILE" != "" ]
then
sudo cp $ANOTHER_FILE $MOUNT_POINT/
if [ `uname` = 'Darwin' ]; then
cp $ANOTHER_FILE $MOUNT_POINT/
else
sudo cp $ANOTHER_FILE $MOUNT_POINT/
fi
fi
sleep 0.5
sudo umount $MOUNT_POINT
if [ `uname` = 'Darwin' ]; then
hdiutil detach $MOUNT_POINT
else
sudo umount $MOUNT_POINT
fi
8 changes: 6 additions & 2 deletions devenv/mount_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@ then
exit 1
fi

mkdir -p $MOUNT_POINT
sudo mount -o loop $DISK_IMG $MOUNT_POINT
if [ `uname` = 'Darwin' ]; then
hdiutil attach -mountpoint $MOUNT_POINT $DISK_IMG
else
mkdir -p $MOUNT_POINT
sudo mount -o loop $DISK_IMG $MOUNT_POINT
fi