summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2007-01-23 23:27:39 +0000
committerPeter Jones <pjones@redhat.com>2007-01-23 23:27:39 +0000
commit288e7075ee454c19e0f9502e1d7583a50d569334 (patch)
treea1bd8ccc49119f21c14b6ce7eb32280bce298699
parent54e81cef38e51c12251fa5b2b29f04392fedd22b (diff)
downloadanaconda-288e7075ee454c19e0f9502e1d7583a50d569334.tar.gz
anaconda-288e7075ee454c19e0f9502e1d7583a50d569334.tar.xz
anaconda-288e7075ee454c19e0f9502e1d7583a50d569334.zip
- Add kernel-pae to our list of kernel packages.anaconda-11.1.2.33-1
- Write changelog - bump version
-rw-r--r--ChangeLog9
-rw-r--r--anaconda.spec7
-rw-r--r--yuminstall.py3
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cad847564..93bdffb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-23 Peter Jones <pjones@redhat.com>
+
+ * anaconda.spec: Bump version.
+
+2007-01-23 Peter Jones <pjones@redhat.com>
+
+ * yuminstall.py (kernelVersionList): add kernel-pae to our list of
+ kernel packages.
+
2007-01-22 Peter Jones <pjones@redhat.com>
* isys/isys.py (readFATLabel): get the ia64 check right.
diff --git a/anaconda.spec b/anaconda.spec
index 7c9eae257..7766af9c7 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 11.1.2.32
+Version: 11.1.2.33
Release: 1
License: GPL
Summary: Graphical system installer
@@ -103,6 +103,11 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Tue Jan 23 2007 Peter Jones <pjones@redhat.com> - 11.1.2.33-1
+- Handle FAT/VFAT labels on upgrade better
+ Resolves: #223890
+- Include kernel-pae in the list of kernels we set up in grub.conf (#223491)
+
* Mon Jan 22 2007 Peter Jones <pjones@redhat.com> - 11.1.2.32-1
- Don't try to migrate fat/vfat labels if there's no fstab yet (#223554).
- Always dasdfmt when we're relabeling a dasd device.
diff --git a/yuminstall.py b/yuminstall.py
index 9b93d96ee..639179ed3 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1382,7 +1382,8 @@ class YumBackend(AnacondaBackend):
kernelVersions = []
# nick is used to generate the lilo name
- for (ktag, nick) in [ ('kernel-smp', 'smp'),
+ for (ktag, nick) in [ ('kernel-pae', 'pae'),
+ ('kernel-smp', 'smp'),
('kernel-xen0', 'xen0'),
('kernel-xenU', 'xenU'),
('kernel-xen', 'xen')]: