scripts/combined-image.sh: remove the use of mktemp to make it more portable
SVN-Revision: 18920
This commit is contained in:
parent
496df32d91
commit
919724ab50
1 changed files with 5 additions and 3 deletions
|
@ -7,9 +7,11 @@ BLKSZ=65536
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IMAGE=${3:-openwrt-combined.img}
|
||||||
|
|
||||||
# Make sure provided images are 64k aligned.
|
# Make sure provided images are 64k aligned.
|
||||||
kern=$(mktemp)
|
kern="${IMAGE}.kernel"
|
||||||
root=$(mktemp)
|
root="${IMAGE}.rootfs"
|
||||||
dd if="$1" of="$kern" bs=$BLKSZ conv=sync 2>/dev/null
|
dd if="$1" of="$kern" bs=$BLKSZ conv=sync 2>/dev/null
|
||||||
dd if="$2" of="$root" bs=$BLKSZ conv=sync 2>/dev/null
|
dd if="$2" of="$root" bs=$BLKSZ conv=sync 2>/dev/null
|
||||||
|
|
||||||
|
@ -26,7 +28,7 @@ md5=$(cat "$kern" "$root" | md5sum -)
|
||||||
$(stat -c "%s" "$kern") $(stat -c "%s" "$root") "${md5%% *}" | \
|
$(stat -c "%s" "$kern") $(stat -c "%s" "$root") "${md5%% *}" | \
|
||||||
dd bs=$BLKSZ conv=sync;
|
dd bs=$BLKSZ conv=sync;
|
||||||
cat "$kern" "$root"
|
cat "$kern" "$root"
|
||||||
) > ${3:-openwrt-combined.img} 2>/dev/null
|
) > ${IMAGE} 2>/dev/null
|
||||||
|
|
||||||
# Clean up.
|
# Clean up.
|
||||||
rm -f "$kern" "$root"
|
rm -f "$kern" "$root"
|
||||||
|
|
Loading…
Reference in a new issue