RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:47:34 +00:00
Code Issues Activity Actions

Build: Fix incorrect user and group settings for disk image (#280)

Browse source 
Build: Fix incorrect user and group settings for disk image.

Fixes #261.
This commit is contained in:
Dan MacDonald 2019-07-03 14:57:37 +00:00 • committed by Andreas Kling
parent b79112e6d6
commit 0d19a4eaab
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/build-image-qemu.sh
View file

@ -13,7 +13,7 @@ fi
echo "setting up disk image..." echo "setting up disk image..."
qemu-img create _disk_image ${DISK_SIZE:-500}m || die "couldn't create disk image" qemu-img create _disk_image ${DISK_SIZE:-500}m || die "couldn't create disk image"
chown 1000:1000 _disk_image || die "couldn't adjust permissions on disk image" chown $build_user:$build_group _disk_image || die "couldn't adjust permissions on disk image"
echo "done" echo "done"
echo -n "creating new filesystem... " echo -n "creating new filesystem... "

4
Kernel/makeall.sh
View file

@ -1,6 +1,10 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Get user and group details for setting qemu disk image ownership
export build_user=$(id -u)
export build_group=$(id -g)
sudo id sudo id
if [ -z "$MAKEJOBS" ]; then if [ -z "$MAKEJOBS" ]; then