diff options
author | Chris Lumens <clumens@redhat.com> | 2008-06-27 08:58:59 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2008-06-27 08:59:16 -0400 |
commit | adfa32b7ae12e10545c927f71655aaef950013a0 (patch) | |
tree | b2340fed7a16e93db0095d8b5e8a7c62ef89f6b6 | |
parent | fad520677a93f6dfbc4af2c6b316f4184c745ad7 (diff) | |
download | anaconda-adfa32b7ae12e10545c927f71655aaef950013a0.tar.gz anaconda-adfa32b7ae12e10545c927f71655aaef950013a0.tar.xz anaconda-adfa32b7ae12e10545c927f71655aaef950013a0.zip |
Rescue mode no longer needs access to a methodstr (#453044).
-rwxr-xr-x | anaconda | 4 | ||||
-rw-r--r-- | rescue.py | 11 |
2 files changed, 1 insertions, 14 deletions
@@ -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) @@ -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: |