diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-29 00:41:22 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-29 00:41:22 +0000 |
| commit | 3859ef2537aaf98b7a4c8735c2fb3e66d8c03d19 (patch) | |
| tree | 22e1285d46b99097ee182d0a9739c933a0fe64ed | |
| parent | b1c612578a673d15d082ecd9a7db41bd7f67a7d4 (diff) | |
| download | upstream-3859ef2537aaf98b7a4c8735c2fb3e66d8c03d19.tar.gz upstream-3859ef2537aaf98b7a4c8735c2fb3e66d8c03d19.tar.bz2 upstream-3859ef2537aaf98b7a4c8735c2fb3e66d8c03d19.zip | |
target/x86: remove temporary files in image generation scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21243 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | target/linux/x86/image/gen_image_olpc.sh | 4 | ||||
| -rwxr-xr-x | 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 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>" @@ -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 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>" @@ -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 <<EOF |