diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/mk-images | 6 | ||||
-rw-r--r-- | scripts/mk-images.ia64 | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index bbba4aa19..3d01d494e 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -775,16 +775,16 @@ fi # Find the kernel, unpack it, and verify it kerneltags="kernel" +arches="$BUILDARCH" if [ "$BUILDARCH" = "ppc" ]; then arches="ppc64 ppc64iseries ppc" elif [ "$BUILDARCH" = "i386" ]; then arches="i586" kerneltags="kernel kernel-xen" elif [ "$BUILDARCH" = "x86_64" ]; then - arches="x86_64" kerneltags="kernel kernel-xen" -else - arches="$BUILDARCH" +elif [ "$BUILDARCH" = "ia64" ]; then + kerneltags="kernel kernel-xen" fi foundakernel="" diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 310368697..5ab457614 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -107,6 +107,7 @@ EOF } makeBootImages() { + if [ "$kerneltag" ! "xen" ]; then # Because ia64 boxes use EFI there needs to be a boot.img dosfs. echo "making boot.img for EFI bootloader" makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz \ @@ -139,4 +140,15 @@ vmlinuz - the kernel used for the installer initrd.img - an initrd with support for all install methods and drivers supported for installation of $PRODUCT EOF + + else # set up the boot stuff for the xen guest kernel + echo "Building $KERNELARCH guest initrd.img" + mkdir -p $TOPDESTPATH/images/xen + makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \ + --initrdsize 12288 \ + --loaderbin loader \ + --modules "$INITRDMODS" + [ $? = 0 ] || exit 1 + cp $KERNELROOT/boot/efi/EFI/redhat/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz + fi } |