domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix x86 boot filesystem allocation (#1736)

Browse Source 
SVN-Revision: 7312
This commit is contained in:
Felix Fietkau
2007-05-23 18:15:11 +00:00
parent 90880f12f5
commit b71b54bb25
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/rb532-2.6/image/gen_image.sh
View File

@@ -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` set `ptgen -o "$OUTPUT" -h 16 -s 32 -t 0x27 -p ${KERNELSIZE}m -t 0x83 -p ${ROOTFSSIZE}m`
KERNELOFFSET="$(($1 / 512))" KERNELOFFSET="$(($1 / 512))"
ROOTFSOFFSET="$(($2 / 512))" ROOTFSOFFSET="$(($3 / 512))"
dd if="$KERNELIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$KERNELOFFSET" dd if="$KERNELIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$KERNELOFFSET"
dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$ROOTFSOFFSET" dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 conv=notrunc seek="$ROOTFSOFFSET"

7
target/linux/x86-2.6/image/gen_image.sh
View File

@@ -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` set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m`
KERNELOFFSET="$(($1 / 512))" KERNELOFFSET="$(($1 / 512))"
ROOTFSOFFSET="$(($2 / 512))" KERNELSIZE="$(($2 / 512))"
ROOTFSSIZE="$(( ($3 - $2) / 512))" ROOTFSOFFSET="$(($3 / 512))"
ROOTFSSIZE="$(($4 / 512))"
BLOCKS="$((($ROOTFSOFFSET - $KERNELOFFSET) / 2 - 1))" BLOCKS="$((($KERNELSIZE / 2) - 1))"
genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc

2
tools/firmware-utils/src/ptgen.c
View File

@@ -140,8 +140,8 @@ static int gen_ptable(int nr)
if (verbose) 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); 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) 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) { if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) < 0) {
fprintf(stderr, "Can't open output file '%s'\n",filename); fprintf(stderr, "Can't open output file '%s'\n",filename);