From adfa32b7ae12e10545c927f71655aaef950013a0 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Fri, 27 Jun 2008 08:58:59 -0400
Subject: Rescue mode no longer needs access to a methodstr (#453044).

---
 anaconda  |  4 ----
 rescue.py | 11 +----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/anaconda b/anaconda
index 94be9ad95..3e825faf8 100755
--- a/anaconda
+++ b/anaconda
@@ -721,10 +721,6 @@ if __name__ == "__main__":
     if opts.rescue:
         anaconda.rescue = True
 
-        if not anaconda.methodstr:
-            sys.stderr.write('--method required for rescue mode\n')
-            sys.exit(1)
-
         import rescue, instdata
 
         anaconda.id = instdata.InstallData(anaconda, [], opts.display_mode)
diff --git a/rescue.py b/rescue.py
index f9e6a74f1..504d42824 100644
--- a/rescue.py
+++ b/rescue.py
@@ -131,15 +131,6 @@ def makeResolvConf(instPath):
     f.write(buf)
     f.close()
 
-# XXX
-#     probably belongs somewhere else
-#
-def methodUsesNetworking(methodstr):
-    for m in ['http://', 'ftp://', 'nfs:', 'nfsiso:']:
-        if methodstr.startswith(m):
-            return 1
-    return 0
-
 #
 # Write out something useful for networking and start interfaces
 #
@@ -221,7 +212,7 @@ def runRescue(anaconda, instClass):
             pass
 
     # see if they would like networking enabled
-    if not methodUsesNetworking(anaconda.id.methodstr):
+    if not network.hasActiveNetDev():
         screen = SnackScreen()
 
         while 1:
-- 
cgit