Re: [PATCH] Fix driver disk loading from partitionless media (#575129).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Sat, 20 Mar 2010, Jon Masters wrote:

On Sat, 2010-03-20 at 00:58 -1000, David Cantrell wrote:
If part_list is NULL in loadDriverFromMedia() in the DEV_PART state, we
want the user to go to DEV_INSERT rather than back to DEV_DEVICE.  If
the user goes back to DEV_DEVICE, we run the risk of entering an
infinite loop as well as no longer handling loading from devices that
lack partitions (floppy disks, CD and DVD media, USB media without a
partition, and so on).
---
 loader2/driverdisk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c
index 0a53b93..40d9901 100644
--- a/loader2/driverdisk.c
+++ b/loader2/driverdisk.c
@@ -291,7 +291,7 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData,
 	    /* if somebody removed the drive, partition list is NULL */
 	    /* rhbz#521189 */
 	    if (!part_list){
-              stage = DEV_DEVICE;
+	       stage = DEV_INSERT;
 	      break;
 	    }

I have been up late with David on this one. We have both independently
tested this with our own boot.iso images, please ACK this right away.


Well, ultimately we've come to the conclusion that reverting the patch for
521189 is a better fix than taking this one.  The test for !part_list here and
changing the stage value does not account for the dir value, but the code just
below it does, which restores driver disk functionality.

- -- David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkumsA8ACgkQ5hsjjIy1VkmaIQCdG4nLf5EdJBXWxf7+lJ4X55e/
XvEAoJ5LiYrXujaJ1u+56iGZOpp6Pvnl
=oXPJ
-----END PGP SIGNATURE-----

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux