summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-23 18:15:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-23 18:15:11 +0000
commit1c4a785b0bea0322094804f823d69fde025f2ab4 (patch)
treef0efe986a887f6b29e4d780d84e1d0d9d58e697f /target
parentf9fec6fd6cd3dd0922152f411d65c6abb4c79fb4 (diff)
fix x86 boot filesystem allocation (#1736)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7312 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/rb532-2.6/image/gen_image.sh2
-rwxr-xr-xtarget/linux/x86-2.6/image/gen_image.sh7
2 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/rb532-2.6/image/gen_image.sh b/target/linux/rb532-2.6/image/gen_image.sh
index e81285979..8875834b9 100755
--- a/target/linux/rb532-2.6/image/gen_image.sh
+++ b/target/linux/rb532-2.6/image/gen_image.sh
@@ -11,7 +11,7 @@ rm -f "$OUTPUT"
set `ptgen -o "$OUTPUT" -h 16 -s 32 -t 0x27 -p ${KERNELSIZE}m -t 0x83 -p ${ROOTFSSIZE}m`
KERNELOFFSET="$(($1 / 512))"
-ROOTFSOFFSET="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
dd if="$KERNELIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$KERNELOFFSET"
dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$ROOTFSOFFSET"
diff --git a/target/linux/x86-2.6/image/gen_image.sh b/target/linux/x86-2.6/image/gen_image.sh
index b4845f5a7..d48e3720d 100755
--- a/target/linux/x86-2.6/image/gen_image.sh
+++ b/target/linux/x86-2.6/image/gen_image.sh
@@ -22,10 +22,11 @@ cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m`
KERNELOFFSET="$(($1 / 512))"
-ROOTFSOFFSET="$(($2 / 512))"
-ROOTFSSIZE="$(( ($3 - $2) / 512))"
+KERNELSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
-BLOCKS="$((($ROOTFSOFFSET - $KERNELOFFSET) / 2 - 1))"
+BLOCKS="$((($KERNELSIZE / 2) - 1))"
genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc