summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-02-13 16:20:24 +0000
committerJeremy Katz <katzj@redhat.com>2006-02-13 16:20:24 +0000
commit424de2251c40f6f16a58ecd860529ed0b19858da (patch)
tree7551d7c687b14012087989b919005ade18c8fd08
parente839f477b8dc05023f29350bc4a1a54a31a0d38d (diff)
downloadanaconda-424de2251c40f6f16a58ecd860529ed0b19858da.tar.gz
anaconda-424de2251c40f6f16a58ecd860529ed0b19858da.tar.xz
anaconda-424de2251c40f6f16a58ecd860529ed0b19858da.zip
2006-02-13 Jeremy Katz <katzj@redhat.com>anaconda-10.92.1-1
* anaconda.spec: Bump version. * scripts/upd-instroot: /lib doesn't always exist * scripts/mk-images (kerneltags): Fix syntax error
-rw-r--r--ChangeLog8
-rw-r--r--anaconda.spec5
-rwxr-xr-xscripts/mk-images2
-rwxr-xr-xscripts/upd-instroot2
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fa32c65ce..1fdbc581f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-13 Jeremy Katz <katzj@redhat.com>
+
+ * anaconda.spec: Bump version.
+
+ * scripts/upd-instroot: /lib doesn't always exist
+
+ * scripts/mk-images (kerneltags): Fix syntax error
+
2006-02-12 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/anaconda.spec b/anaconda.spec
index 02107719a..6213a548a 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 10.92.0
+Version: 10.92.1
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.1-1
+- try to fix x86_64 xen guest
+
* Sun Feb 12 2006 Jeremy Katz <katzj@redhat.com> - 10.92.0-1
- Fix length of package name in text install (dcantrel, #180469)
- Various minor cleanups
diff --git a/scripts/mk-images b/scripts/mk-images
index 7b6f64437..c9082ce1e 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -778,7 +778,7 @@ if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
elif [ "$BUILDARCH" = "i386" ]; then
arches="i586"
kerneltags="kernel kernel-xen-guest"
-elif [ "$BUILDARCH" = "x86_64"]; then
+elif [ "$BUILDARCH" = "x86_64" ]; then
arches="x86_64"
kerneltags="kernel kernel-xen-guest"
else
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index fd1d68c8c..d87ade253 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1239,7 +1239,7 @@ for p in $DEST $DESTGR; do
done
if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then
- (cd $p/lib && rm -f libnss_files.so.1 libnss_dns.so.1)
+ (cd $p/lib* && rm -f libnss_files.so.1 libnss_dns.so.1)
fi
if [ -d $DEST/usr/share/zoneinfo ]; then