diff --git a/scripts/build/make.rasp.sh b/scripts/build/make.rasp.sh index d49ba641..2dbd3553 100755 --- a/scripts/build/make.rasp.sh +++ b/scripts/build/make.rasp.sh @@ -116,13 +116,17 @@ else cp -pv $SCUDUM/boot/initrd.img $IMG_DIR/initrd.img fi -echo "make.rasp: intializing $FILE with $BLOCK_COUNT blocks of size $BLOCK_SIZE ($SIZE bytes)" +echo "make.rasp: initializing $FILE with $BLOCK_COUNT blocks of size $BLOCK_SIZE ($SIZE bytes)" dd if=/dev/zero of=$FILE bs=$BLOCK_SIZE count=$BLOCK_COUNT && sync +echo "make.rasp: setting up partition table for $FILE (using fdisk) with $HEADS heads and $SECTORS sectors" + (echo n; echo p; echo 1; echo ; echo ; echo a; echo 1; echo t; echo c; echo w) | fdisk -H $HEADS -S $SECTORS $FILE &> /dev/null sleep $SLEEP_TIME && sync +echo "mask.rasp: setting up loop devices for $FILE" + DEV_LOOP_DEVICE=$(losetup -f) DEV_LOOP_NAME=$(echo "$DEV_LOOP_DEVICE" | grep -oE "[^/]+$") DEV_LOOP_PART=${DEV_LOOP_NAME}p1 diff --git a/scripts/build/make.usb.sh b/scripts/build/make.usb.sh index cf28cee6..832bc79c 100755 --- a/scripts/build/make.usb.sh +++ b/scripts/build/make.usb.sh @@ -91,10 +91,12 @@ if [ "$AUTORUN" == "1" ]; then cp -v $SCUDUM/isolinux/scudum.ico $IMG_DIR fi -echo "make.usb: intializing $FILE with $BLOCK_COUNT blocks of size $BLOCK_SIZE ($SIZE bytes)" +echo "make.usb: initializing $FILE with $BLOCK_COUNT blocks of size $BLOCK_SIZE ($SIZE bytes)" dd if=/dev/zero of=$FILE bs=$BLOCK_SIZE count=$BLOCK_COUNT && sync +echo "make.rasp: setting up partition table for $FILE (using fdisk) with $HEADS heads and $SECTORS sectors" + (echo n; echo p; echo 1; echo ; echo ; echo a; echo 1; echo t; echo c; echo w) | fdisk -H $HEADS -S $SECTORS $FILE &> /dev/null sleep $SLEEP_TIME && sync @@ -103,7 +105,7 @@ if [ -e $PREFIX/lib/syslinux/mbr ]; then ln -s $PREFIX/lib/syslinux/mbr/mbr.bin $PREFIX/lib/syslinux/mbr.bin fi -echo "make.usb: intializing $FILE with mbr.bin" +echo "make.usb: initializing $FILE with mbr.bin" dd if=$PREFIX/lib/syslinux/mbr.bin of=$FILE conv=notrunc bs=440 count=1 && sync @@ -111,6 +113,8 @@ if [ -e $PREFIX/lib/syslinux/mbr ]; then rm -f $PREFIX/lib/syslinux/mbr.bin fi +echo "mask.rasp: setting up loop devices for $FILE" + DEV_LOOP_DEVICE=$(losetup -f) DEV_LOOP_NAME=$(echo "$DEV_LOOP_DEVICE" | grep -oE "[^/]+$") DEV_LOOP_PART=${DEV_LOOP_NAME}p1