Re: [PATCH] "ip=ibft" is not needed any more if ibft configuration is available (#517768)

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

 



Ack.

On 11/30/2009 10:34 AM, Martin Sivak wrote:
---
  loader2/loader.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/loader2/loader.c b/loader2/loader.c
index 5f22b19..0d16c56 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -958,7 +958,7 @@ static char *doLoaderMain(char * location,
          url = findAnacondaCD(location, modInfo, modLoaded, * modDepsPtr, !FL_RESCUE(flags));
          /* if we found a CD and we're not in rescue or vnc mode return */
          /* so we can short circuit straight to stage 2 from CD         */
-        if (url&&  (!FL_RESCUE(flags)&&  !hasGraphicalOverride()))
+        if (url&&  (!FL_RESCUE(flags)&&  !hasGraphicalOverride()&&  !ibft_present()))
              return url;
          else {
              rhcdfnd = 1;
@@ -1124,7 +1124,7 @@ static char *doLoaderMain(char * location,
          case STEP_NETWORK:
              if ( (installMethods[validMethods[methodNum]].deviceType !=
                    CLASS_NETWORK)&&  (!hasGraphicalOverride())&&
-                 !FL_ASKNETWORK(flags)) {
+                 !FL_ASKNETWORK(flags)&&  !ibft_present()) {
                  needsNetwork = 0;
                  if (dir == 1)
                      step = STEP_URL;

_______________________________________________
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