Modified img package to work on my system

Author: axlan

Makefile

@@ -103,11 +103,12 @@ $(ELF_KMULTIBOOT):
 	$(OBJCOPY) --remove-section=.comment --remove-section=.note -O binary $< $@
 	@echo `du -h $@`
 
+$(IMG): LOOP = $(shell sudo $(TOOLS_DIR)/getnextloop.sh)
 $(IMG): all
-	sudo $(TOOLS_DIR)/partitioning.sh /dev/loop0 -o $@ $(BIN_STAGE0) $(BIN_STAGE1)
-	sudo $(TOOLS_DIR)/formatting.sh /dev/loop0 $@
-	sudo $(TOOLS_DIR)/fcopytofs.sh /dev/loop0 $@ $(KMULTIBOOT_ROOT_FS_DIR)
-	sudo chown matt:matt $@
+	sudo $(TOOLS_DIR)/partitioning.sh $(LOOP) -o $@ $(BIN_STAGE0) $(BIN_STAGE1)
+	sudo $(TOOLS_DIR)/formatting.sh $(LOOP) $@
+	sudo $(TOOLS_DIR)/fcopytofs.sh $(LOOP) $@ $(KMULTIBOOT_ROOT_FS_DIR)
+	sudo chown $(USER):$(USER) $@
 
 
 ##############

tools/fcopytofs.sh

@@ -126,16 +126,20 @@ mkdir -p ${mount_point}
 # mount the FAT partition and copy files
 ########################################
 losetup ${loopback_device} ${disk_image}
+sudo partx -v --add ${loopback_device}
 
 echo "Mount partition ${device_partition} (begin=${device_partition_sector_start}, end=${device_partition_sector_end}), size=${device_partition_size} bytes"
 mount -t vfat ${device_partition} ${mount_point}
 echo "Copy files to ${device_partition}"
 cp ${fs_root_path}/* ${mount_point}
 ls ${mount_point}
+
+sleep 1
 sync
 umount ${mount_point}
 echo "Unmount partition ${device_partition}"
 
+sudo partx -v --delete ${loopback_device}
 losetup -d ${loopback_device}
 
 exit 0

tools/formatting.sh

@@ -134,9 +134,15 @@ if [ $? -ne 0 ]; then
     losetup ${loopback_device} ${disk_image}
 fi
 
+sudo partx -v --add ${loopback_device}
+
 format_FAT_partitions
 format_MinixV1_partitions
 
+sync
+
+sudo partx -v --delete ${loopback_device}
+
 losetup -d ${loopback_device}
 
 exit 0

tools/getnextloop.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+TMP_FILE=/tmp/dummy_image
+DISKSIZE=512
+
+# Make sure only root can run the script
+if [ "$(id -u)" != "0" ]; then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
+cat /dev/zero | dd of=${TMP_FILE} count=${DISKSIZE} 2> /dev/null
+
+loopback_device=$(sudo losetup --show -f $TMP_FILE)
+sudo losetup -d $loopback_device
+
+echo $loopback_device

tools/partitioning.sh

@@ -190,6 +190,8 @@ ${fdisk_cmd_print_partition_table}
 ${fdisk_cmd_write_table_and_exit}
 EOF
 
+sync
+
 losetup -d ${loopback_device}
 
 exit 0