aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-23 18:15:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-23 18:15:11 +0000
commitb71b54bb25eef1c93f70422f4068d8d7a6d7ba01 (patch)
treecb48804e7b3045e71dd2844064146ec7f2c995e5
parent90880f12f51715afa60c261f2089191beef5c2b2 (diff)
downloadupstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.tar.gz
upstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.tar.bz2
upstream-b71b54bb25eef1c93f70422f4068d8d7a6d7ba01.zip
fix x86 boot filesystem allocation (#1736)
SVN-Revision: 7312
-rwxr-xr-xtarget/linux/rb532-2.6/image/gen_image.sh2
-rwxr-xr-xtarget/linux/x86-2.6/image/gen_image.sh7
-rw-r--r--tools/firmware-utils/src/ptgen.c2
3 files changed, 6 insertions, 5 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
diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c
index ce93016667..8733e252cb 100644
--- a/tools/firmware-utils/src/ptgen.c
+++ b/tools/firmware-utils/src/ptgen.c
@@ -140,8 +140,8 @@ static int gen_ptable(int nr)
if (verbose)
fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", i, (long) start * 512, ((long) start + (long) len) * 512, (long) len * 512);
printf("%ld\n", ((long) start * 512));
+ printf("%ld\n", ((long) len * 512));
}
- printf("%ld\n", ((long) (start + len) * 512));
if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) < 0) {
fprintf(stderr, "Can't open output file '%s'\n",filename);