diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-02-13 20:21:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-02-13 20:21:00 +0000 |
| commit | 46c6987bc2fecfe80efd157a41636d70ab5900fa (patch) | |
| tree | 9c1dbbda55ffbbe7f589080c282e70f0ab740e02 | |
| parent | 424de2251c40f6f16a58ecd860529ed0b19858da (diff) | |
| download | anaconda-46c6987bc2fecfe80efd157a41636d70ab5900fa.tar.gz anaconda-46c6987bc2fecfe80efd157a41636d70ab5900fa.tar.xz anaconda-46c6987bc2fecfe80efd157a41636d70ab5900fa.zip | |
2006-02-13 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
* scripts/mk-images.x86_64 (SYSLINUX): More x86_64 xen kernel fixes
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | anaconda.spec | 5 | ||||
| -rw-r--r-- | scripts/mk-images.x86_64 | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -2,6 +2,10 @@ * anaconda.spec: Bump version. + * scripts/mk-images.x86_64 (SYSLINUX): More x86_64 xen kernel fixes + + * anaconda.spec: Bump version. + * scripts/upd-instroot: /lib doesn't always exist * scripts/mk-images (kerneltags): Fix syntax error diff --git a/anaconda.spec b/anaconda.spec index 6213a548a..bf7b5b26a 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.1 +Version: 10.92.2 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Feb 13 2006 Jeremy Katz <katzj@redhat.com> - 10.92.2-1 +- more x86_64 xen guest fixing + * Mon Feb 13 2006 Jeremy Katz <katzj@redhat.com> - 10.92.1-1 - try to fix x86_64 xen guest diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64 index 194244925..fa69476ff 100644 --- a/scripts/mk-images.x86_64 +++ b/scripts/mk-images.x86_64 @@ -55,7 +55,8 @@ be written to the device using dd. EOF makeBootImages() { - echo "Building initrd-everything.img" + if [ "$kerneltag" != "guest" ]; then + echo "Building initrd.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \ --initrdsize 8192 \ --loaderbin loader \ @@ -112,4 +113,14 @@ 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 8192 \ + --loaderbin loader \ + --modules "$INITRDMODS" + [ $? = 0 ] || exit 1 + cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/images/xen/vmlinuz + fi } |