Browse Source

Merge pull request #51 from Vaelatern/truncate

Switch to truncate to allocate storage for images
Juan RP 9 năm trước cách đây
mục cha
commit
62406cba3f
2 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 1
      mkimage.sh.in
  2. 3 3
      mklive.sh.in

+ 1 - 1
mkimage.sh.in

@@ -131,7 +131,7 @@ case "$DD_VERSION" in
 esac
 
 info_msg "Creating disk image ($IMGSIZE) ..."
-dd if=/dev/zero of=$FILENAME bs=$IMGSIZE count=1 ${DD_SPARSE} >/dev/null 2>&1
+truncate -s "${IMGSIZE}M" $FILENAME >/dev/null 2>&1
 
 ROOTFSDIR=$(mktemp -d)
 

+ 3 - 3
mklive.sh.in

@@ -200,7 +200,7 @@ generate_grub_efi_boot() {
     modprobe -q loop || :
 
     # Create EFI vfat image.
-    dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=16384  >/dev/null 2>&1
+    truncate -s 16M $GRUB_DIR/efiboot.img >/dev/null 2>&1
     mkfs.vfat -F12 -S 512 -n "grub_uefi" "$GRUB_DIR/efiboot.img" >/dev/null 2>&1
 
     GRUB_EFI_TMPDIR="$(mktemp --tmpdir=$HOME -d)"
@@ -249,8 +249,8 @@ generate_squashfs() {
         ROOTFS_FREESIZE="$((ROOTFS_SIZE/6))"
     fi
     mkdir -p "$BUILDDIR/tmp/LiveOS"
-    dd if=/dev/zero of="$BUILDDIR/tmp/LiveOS/ext3fs.img" \
-        bs="$((ROOTFS_SIZE+ROOTFS_FREESIZE))M" count=1 >/dev/null 2>&1
+    truncate -s "$((ROOTFS_SIZE+ROOTFS_FREESIZE))M" \
+	    $BUILDDIR/tmp/LiveOS/ext3fs.img >/dev/null 2>&1
     mkdir -p "$BUILDDIR/tmp-rootfs"
     mkfs.ext3 -F -m1 "$BUILDDIR/tmp/LiveOS/ext3fs.img" >/dev/null 2>&1
     mount -o loop "$BUILDDIR/tmp/LiveOS/ext3fs.img" "$BUILDDIR/tmp-rootfs"