From ec5a33ce1a21a8361b2cc1e5dc06a5b7dee1a362 Mon Sep 17 00:00:00 2001
From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Date: Tue, 1 Sep 2015 21:17:19 +0200
Subject: [PATCH] multiboot: set label to MultiBoot and delete loop device
---
Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b6128d1..df803ec 100644
--- a/Makefile
+++ b/Makefile
@@ -502,7 +502,8 @@ image : image_content $(GRUB_ASSEMBLE_DIR)/mbr.img
#it can be used to test the image creation process of lipck (it is not
#necessary to remaster an image to test this crucial base part).
multiboot :
- $(MAKE) "IMAGE_PART_FILE=$(WORKSPACE)/multiboot.part" image_skel_file
+ $(MAKE) "IMAGE_PART_FILE=$(WORKSPACE)/multiboot.part" IMAGE_PART_LABEL=MultiBoot \
+ image_skel_file
mkdir -p "$(WORKSPACE)/multiboot.work"
mount "$(WORKSPACE)/multiboot.part" "$(WORKSPACE)/multiboot.work"
$(MAKE) "IMAGE_DIR=$(WORKSPACE)/multiboot.work" image_grub_install \
@@ -511,7 +512,7 @@ multiboot :
#default bootloader for 64bit efi systems
mv "$(WORKSPACE)/multiboot.work/efi/boot/"{grubx64-unsigned.efi,bootx64.efi} \
|| (umount "$(WORKSPACE)/multiboot.work" && exit 1)
- umount "$(WORKSPACE)/multiboot.work"
+ umount -d "$(WORKSPACE)/multiboot.work"
$(MAKE) "IMAGE_PART_FILE=$(WORKSPACE)/multiboot.part" IMAGE_FILE=MultiBoot.img \
image_assemble
--
GitLab