From 3604a9361a5864d95bf964a861c60a108941df8a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Apr 18 2008 20:09:31 +0000 Subject: * Fri Apr 18 2008 Jeremy Katz - 11.4.0.75-1 - Listing the directories before expiring yum caches helps (katzj) --- diff --git a/.cvsignore b/.cvsignore index 4e5ba69..e399e4c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -anaconda-11.4.0.72.tar.bz2 -anaconda-11.4.0.73.tar.bz2 +anaconda-11.4.0.75.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 5a1c068..e2a8f7b 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -2,14 +2,13 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.73 -Release: 2 +Version: 11.4.0.75 +Release: 1 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda Source0: anaconda-%{version}.tar.bz2 -Patch0: revert-discinfo-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,7 +145,6 @@ sets, but are not meant for use on already installed systems. %prep %setup -q -%patch -p1 %build %{__make} depend @@ -209,9 +207,31 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog -* Thu Apr 17 2008 Chris Lumens 11.4.0.73-2 -- Revert the patch that doesn't check for .discinfo on rescue mode CDs - as this also breaks the method prompting screen. +* Fri Apr 18 2008 Jeremy Katz - 11.4.0.75-1 +- Listing the directories before expiring yum caches helps (katzj) + +* Fri Apr 18 2008 Jeremy Katz - 11.4.0.74-1 +- Don't look for .discinfo on the rescue CD (#442098). (clumens) +- Use /var/cache/yum as the cachedir since /tmp might be + too small (#443083). (clumens) +- Revert "Don't look for a .discinfo file in rescue + mode (jvonau, #442098)." (clumens) +- Revert "Fix figuring out that the CD has stage2 on it and should + be mounted." (clumens) +- We've always expected devices to be strings, not unicode (#443040) (katzj) +- Resizing lvs on top of RAID fails, make the error not a traceback (katzj) +- Don't put an extra slash on the error message (jgranado) +- Kernel changed howw the uevent API works for firmware + loading *AGAIN*. (pjones) +- Expose the log file descriptors so fwloader can avoid closing + them (pjones) +- Minor UI tweaks to passphrase dialogs (katzj) +- Nuke preupgrade cache once we're done (#442832) (katzj) +- Support bringing up the network if needed with preupgrade (#442610) (katzj) +- Use a real GtkDialog instead of some crazy hacked up dialog (katzj) +- Fix handling of pre-existing raids for the upgrade/rescue + case (#441770) (katzj) +- Add missing / (Doug Chapman, #442751) (katzj) * Wed Apr 16 2008 David Cantrell - 11.4.0.73-1 - Fix figuring out that the CD has stage2 on it and should be mounted. (clumens) diff --git a/revert-discinfo-check.patch b/revert-discinfo-check.patch deleted file mode 100644 index 071ddf0..0000000 --- a/revert-discinfo-check.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c -index 768d83d..1dd28cf 100644 ---- a/loader2/cdinstall.c -+++ b/loader2/cdinstall.c -@@ -234,7 +234,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, - int i, r, rc; - int foundinvalid = 0; - int stage2inram = 0; -- char *buf, *stage2loc, *imageDir; -+ char *buf, *stage2loc, *discinfoloc, *imageDir; - char *stage2img; - struct device ** devices; - char *cddev = NULL; -@@ -248,9 +248,11 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, - if (loaderData && FL_STAGE2(flags)) { - stage2loc = strdup(location); - r = asprintf(&imageDir, "%.*s", (int) (strrchr(location, '/') - location), location); -+ r = asprintf(&discinfoloc, "%s/.discinfo", imageDir); - } else { - r = asprintf(&stage2loc, "%s/images/stage2.img", location); - r = asprintf(&imageDir, "%s/images", location); -+ r = asprintf(&discinfoloc, "%s/.discinfo", location); - } - - /* JKFIXME: ASSERT -- we have a cdrom device when we get here */ -@@ -271,7 +273,9 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, - - if (!(rc=doPwMount(devices[i]->device, location, "iso9660", "ro"))) { - cddev = devices[i]->device; -- if (!access(stage2loc, R_OK)) { -+ if (!access(stage2loc, R_OK) && -+ (!requirepkgs || !access(discinfoloc, R_OK))) { -+ - /* if in rescue mode lets copy stage 2 into RAM so we can */ - /* free up the CD drive and user can have it avaiable to */ - /* aid system recovery. */ -@@ -313,6 +317,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, - - free(stage2loc); - free(imageDir); -+ free(discinfoloc); - - if (r == -1) - return NULL; -@@ -356,6 +361,7 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, - err: - free(stage2loc); - free(imageDir); -+ free(discinfoloc); - return NULL; - } - diff --git a/sources b/sources index bcee9cb..6639e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99daae7722f324a45fdfa42bb7f67c35 anaconda-11.4.0.73.tar.bz2 +4ac7ec316a6bf8bf86d2a064b8052616 anaconda-11.4.0.75.tar.bz2