From 7a95cd813214cdc7dc98673f8a9d6c9464aff699 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 25 Jul 2006 23:51:39 +0000
Subject: [PATCH] - also cleanup after Ctrl-C - round up ramdisk_size to
 nearest kilobyte to avoid kernel memory   contamination if the size of the
 cpio archives is not a perfect   multiple of 1024!

---
 build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 212c5ce..968c457 100755
--- a/build.sh
+++ b/build.sh
@@ -88,7 +88,7 @@ FULL_VERSION_STRING="$PLC_NAME BootCD $BOOTCD_VERSION"
 # Root of the ISO and USB images
 overlay=$(mktemp -d /tmp/overlay.XXXXXX)
 install -d -m 755 $overlay
-trap "rm -rf $overlay" ERR
+trap "rm -rf $overlay" ERR INT
 
 # Create version files
 echo "* Creating version files"
@@ -180,11 +180,11 @@ echo "* Compressing overlay image"
 (cd $overlay && find . | cpio --quiet -c -o) | gzip -9 >$isofs/overlay.img
 
 rm -rf $overlay
-trap - ERR
+trap - ERR INT
 
 # Calculate ramdisk size (total uncompressed size of both archives)
 ramdisk_size=$(gzip -l $isofs/bootcd.img $isofs/overlay.img | tail -1 | awk '{ print $2; }') # bytes
-ramdisk_size=$(($ramdisk_size / 1024)) # kilobytes
+ramdisk_size=$((($ramdisk_size + 1023) / 1024)) # kilobytes
 
 # Write isolinux configuration
 echo "$FULL_VERSION_STRING" >$isofs/pl_version
@@ -218,7 +218,7 @@ mkfs.vfat -C "$usb" $(($(du -sk $isofs | awk '{ print $1; }') + 1024))
 # Mount it
 tmp=$(mktemp -d /tmp/bootcd.XXXXXX)
 mount -o loop "$usb" $tmp
-trap "umount $tmp; rm -rf $tmp" ERR
+trap "umount $tmp; rm -rf $tmp" ERR INT
 
 # Populate it
 echo "* Populating USB image"
@@ -228,7 +228,7 @@ echo "* Populating USB image"
 mv $tmp/isolinux.cfg $tmp/syslinux.cfg
 umount $tmp
 rmdir $tmp
-trap - ERR
+trap - ERR INT
 
 echo "* Making USB image bootable"
 $srcdir/syslinux/unix/syslinux "$usb"
-- 
2.43.0