diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-05-23 18:15:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-23 18:15:11 +0000 |
| commit | b71b54bb25eef1c93f70422f4068d8d7a6d7ba01 (patch) | |
| tree | cb48804e7b3045e71dd2844064146ec7f2c995e5 /target/linux | |
| parent | 90880f12f51715afa60c261f2089191beef5c2b2 (diff) | |
| download | upstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.tar.gz upstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.tar.bz2 upstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.zip | |
fix x86 boot filesystem allocation (#1736)
SVN-Revision: 7312
Diffstat (limited to 'target/linux')
| -rwxr-xr-x | target/linux/rb532-2.6/image/gen_image.sh | 2 | ||||
| -rwxr-xr-x | target/linux/x86-2.6/image/gen_image.sh | 7 |
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 e812859797..8875834b9e 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 b4845f5a77..d48e3720dc 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 |