Skip to content
Snippets Groups Projects
Commit 919724ab authored by Felix Fietkau's avatar Felix Fietkau
Browse files

scripts/combined-image.sh: remove the use of mktemp to make it more portable 

SVN-Revision: 18920
parent 496df32d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/combined-image.sh
+ 5
− 3
View file @ 919724ab
...@@ -7,9 +7,11 @@ BLKSZ=65536 ...@@ -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 -) ...@@ -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"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment