diff options
| author | etaIneLp <33374857+etaIneLp@users.noreply.github.com> | 2020-05-28 04:08:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 10:08:38 +0200 |
| commit | 330aecb5d8982ee3823909908993e4284cf1b7c9 (patch) | |
| tree | a1f7af00b1ef3e01b700262d8716719fd857be48 /Meta/build-image-grub.sh | |
| parent | 7bc871ca8dd851605bfd67cb5be1538d009aa56b (diff) | |
| download | serenity-330aecb5d8982ee3823909908993e4284cf1b7c9.zip | |
Build: Use a separate byproduct name for the GRUB disk image (#2424)
The grub-image target no longer conflicts with normal image target.
This unbreaks using CMake with Ninja.
Fixes #2423.
Diffstat (limited to 'Meta/build-image-grub.sh')
| -rwxr-xr-x | Meta/build-image-grub.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Meta/build-image-grub.sh b/Meta/build-image-grub.sh index 985323e4a9..019761dd9d 100755 --- a/Meta/build-image-grub.sh +++ b/Meta/build-image-grub.sh @@ -22,12 +22,12 @@ fi echo "using grub-install at ${grub}" echo "setting up disk image..." -dd if=/dev/zero of=_disk_image bs=1M count="${DISK_SIZE:-800}" status=none || die "couldn't create disk image" -chown "$SUDO_UID":"$SUDO_GID" _disk_image || die "couldn't adjust permissions on disk image" +dd if=/dev/zero of=grub_disk_image bs=1M count="${DISK_SIZE:-800}" status=none || die "couldn't create disk image" +chown "$SUDO_UID":"$SUDO_GID" grub_disk_image || die "couldn't adjust permissions on disk image" echo "done" printf "creating loopback device... " -dev=$(losetup --find --partscan --show _disk_image) +dev=$(losetup --find --partscan --show grub_disk_image) if [ -z "$dev" ]; then die "couldn't mount loopback device" fi |