summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scripts/mk-images.i3862
-rw-r--r--scripts/mk-images.x86_642
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 239e19fd9..d001fb91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-02-13 Jeremy Katz <katzj@redhat.com>
+ * scripts/mk-images.x86_64: Make guest kernel globbing more reliable.
+ * scripts/mk-images.i386: Likewise.
+
+2006-02-13 Jeremy Katz <katzj@redhat.com>
+
* anaconda.spec: Bump version.
* yuminstall.py (YumBackend.doPostSelection): Only import upgrade
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 5166d4a1b..8a85f48ee 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -146,6 +146,6 @@ EOF
--loaderbin loader \
--modules "$INITRDMODS"
[ $? = 0 ] || exit 1
- cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/images/xen/vmlinuz
+ cp $KERNELROOT/boot/vmlinuz-*guest $TOPDESTPATH/images/xen/vmlinuz
fi
}
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index fa69476ff..730be8e14 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -121,6 +121,6 @@ EOF
--loaderbin loader \
--modules "$INITRDMODS"
[ $? = 0 ] || exit 1
- cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/images/xen/vmlinuz
+ cp $KERNELROOT/boot/vmlinuz-*guest $TOPDESTPATH/images/xen/vmlinuz
fi
}