From 0d19a4eaab0f3319d3233914b1b77fbe24ef6b73 Mon Sep 17 00:00:00 2001 From: Dan MacDonald Date: Wed, 3 Jul 2019 14:57:37 +0000 Subject: [PATCH] Build: Fix incorrect user and group settings for disk image (#280) Build: Fix incorrect user and group settings for disk image. Fixes #261. --- Kernel/build-image-qemu.sh | 2 +- Kernel/makeall.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Kernel/build-image-qemu.sh b/Kernel/build-image-qemu.sh index 229663868e9..492293a068b 100755 --- a/Kernel/build-image-qemu.sh +++ b/Kernel/build-image-qemu.sh @@ -13,7 +13,7 @@ fi echo "setting up 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 -n "creating new filesystem... " diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index 6ab41fec295..55d75e51e15 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -1,6 +1,10 @@ #!/bin/bash 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 if [ -z "$MAKEJOBS" ]; then