02e2548b84
This changes the x86 image generation to match x86_64, using the PARTUUID for the rootfs instead of explicitly configuring the device. It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2. Tested in QEMU/KVM with VirtIO, VirtualBox and VMware. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 44966
40 lines
1.1 KiB
Bash
Executable File
40 lines
1.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Copyright (C) 2006-2012 OpenWrt.org
|
|
set -x
|
|
[ $# == 5 -o $# == 6 ] || {
|
|
echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
|
|
exit 1
|
|
}
|
|
|
|
OUTPUT="$1"
|
|
KERNELSIZE="$2"
|
|
KERNELDIR="$3"
|
|
ROOTFSSIZE="$4"
|
|
ROOTFSIMAGE="$5"
|
|
ALIGN="$6"
|
|
|
|
rm -f "$OUTPUT"
|
|
|
|
head=16
|
|
sect=63
|
|
cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
|
|
|
|
# create partition table
|
|
set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}`
|
|
|
|
KERNELOFFSET="$(($1 / 512))"
|
|
KERNELSIZE="$(($2 / 512))"
|
|
ROOTFSOFFSET="$(($3 / 512))"
|
|
ROOTFSSIZE="$(($4 / 512))"
|
|
|
|
BLOCKS="$((($KERNELSIZE / 2) - 1))"
|
|
|
|
[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
|
|
dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
|
|
|
|
[ -n "$NOGRUB" ] && exit 0
|
|
|
|
genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
|
|
dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
|
|
rm -f "$OUTPUT.kernel"
|