aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/image
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-29 00:41:22 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-29 00:41:22 +0000
commitb6734d97538a3786829651416ed9d73e44eceb08 (patch)
tree4e9ef5228b06fb97fba10c73a0945bab7b7579d1 /target/linux/x86/image
parent224db523da8a4d49a20300b25081fbb5cccb9626 (diff)
downloadupstream-b6734d97538a3786829651416ed9d73e44eceb08.tar.gz
upstream-b6734d97538a3786829651416ed9d73e44eceb08.tar.bz2
upstream-b6734d97538a3786829651416ed9d73e44eceb08.zip
target/x86: remove temporary files in image generation scripts
SVN-Revision: 21243
Diffstat (limited to 'target/linux/x86/image')
-rwxr-xr-xtarget/linux/x86/image/gen_image_olpc.sh4
-rwxr-xr-xtarget/linux/x86/image/gen_image_x86.sh4
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