diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-06-14 04:02:19 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-06-14 04:02:19 +0000 |
| commit | d4a2696197ba47caf9de3bf85fa63dff3c2f0546 (patch) | |
| tree | 90ecc8ba0d36293bafc35d0db3b0e264c28de266 /scripts | |
| parent | c18c80876de272ad6a886326d0e0584b6d3b1456 (diff) | |
2006-06-14 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: New xen kernel name.
* scripts/mk-images.x86: Likewise.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 6 | ||||
| -rw-r--r-- | scripts/mk-images.x86 | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index b9ca1494b..297e16431 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -777,10 +777,10 @@ if [ "$BUILDARCH" = "ppc" ]; then arches="ppc64 ppc64iseries ppc" elif [ "$BUILDARCH" = "i386" ]; then arches="i586" - kerneltags="kernel kernel-xenU" + kerneltags="kernel kernel-xen" elif [ "$BUILDARCH" = "x86_64" ]; then arches="x86_64" - kerneltags="kernel kernel-xenU" + kerneltags="kernel kernel-xen" else arches="$BUILDARCH" fi @@ -805,7 +805,7 @@ for KERNELARCH in $arches; do foundakernel="yes" - if [ "${kernelvers}" = "kernel-xenU" ]; then kerneltag="xenU" ; fi + if [ "${kernelvers}" = "kernel-xen" ]; then kerneltag="xen" ; fi version=$(rpm --nodigest --nosignature --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kerneltag} arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage) diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 083eb9dd1..822e56961 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -55,7 +55,7 @@ be written to the device using dd. EOF makeBootImages() { - if [ "$kerneltag" != "xenU" ]; then + if [ "$kerneltag" != "xen" ]; then echo "Building initrd.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \ --initrdsize 8192 \ @@ -121,6 +121,6 @@ EOF --loaderbin loader \ --modules "$INITRDMODS" [ $? = 0 ] || exit 1 - cp $KERNELROOT/boot/vmlinuz-*xenU $TOPDESTPATH/images/xen/vmlinuz + cp $KERNELROOT/boot/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz fi } |