From b6734d97538a3786829651416ed9d73e44eceb08 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 29 Apr 2010 00:41:22 +0000 Subject: [PATCH] target/x86: remove temporary files in image generation scripts SVN-Revision: 21243 --- target/linux/x86/image/gen_image_olpc.sh | 4 ++-- target/linux/x86/image/gen_image_x86.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/x86/image/gen_image_olpc.sh b/target/linux/x86/image/gen_image_olpc.sh index 4fd6e377e5..82bc4ed957 100755 --- a/target/linux/x86/image/gen_image_olpc.sh +++ b/target/linux/x86/image/gen_image_olpc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2006 - 2007 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org set -x [ $# == 5 ] || { echo "SYNTAX: $0 " @@ -32,4 +32,4 @@ genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc -#rm -f "$OUTPUT.kernel" +rm -f "$OUTPUT.kernel" diff --git a/target/linux/x86/image/gen_image_x86.sh b/target/linux/x86/image/gen_image_x86.sh index 5d4c0dd34c..e1d1b92dda 100755 --- a/target/linux/x86/image/gen_image_x86.sh +++ b/target/linux/x86/image/gen_image_x86.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org set -x [ $# == 5 ] || { echo "SYNTAX: $0 " @@ -35,7 +35,7 @@ dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc -#rm -f "$OUTPUT.kernel" +rm -f "$OUTPUT.kernel" which chpax >/dev/null && chpax -zp $(which grub) grub --batch --no-curses --no-floppy --device-map=/dev/null <