diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-06-05 22:22:52 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-06-18 10:44:56 -0400 |
| commit | 0d6b77b3fa285b4a1eecc5ad965c8cfcd2de0303 (patch) | |
| tree | e55a54ced9002852f17c12c5bbc27b67f0b4e2c2 /instdata.py | |
| parent | 2c84fb5f83e7bc06d2069553438e14813861a8ea (diff) | |
| download | anaconda-0d6b77b3fa285b4a1eecc5ad965c8cfcd2de0303.tar.gz anaconda-0d6b77b3fa285b4a1eecc5ad965c8cfcd2de0303.tar.xz anaconda-0d6b77b3fa285b4a1eecc5ad965c8cfcd2de0303.zip | |
Don't pass methodstr into the backend and instdata.
Diffstat (limited to 'instdata.py')
| -rw-r--r-- | instdata.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/instdata.py b/instdata.py index 4b22e8a9e..227557aea 100644 --- a/instdata.py +++ b/instdata.py @@ -98,8 +98,8 @@ class InstallData: stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): target = os.readlink("/dev/live") self.partitions.protected = [target] - elif self.anaconda._loaderMethodstr.startswith("hd:"): - method = self.anaconda._loaderMethodstr[3:] + elif self.anaconda.methodstr and self.anaconda.methodstr.startswith("hd:"): + method = self.anaconda.methodstr[3:] device = method.split(":", 3)[0] if device.startswith("/dev/"): device = device[5:] @@ -222,9 +222,6 @@ class InstallData: else: f.write("install\n"); - # figure out the install method and write out a line - self.anaconda.writeMethodstr(f) - if self.instClass.skipkey: f.write("key --skip\n") elif self.instClass.installkey: @@ -275,7 +272,7 @@ class InstallData: os.chmod(filename, 0600) - def __init__(self, anaconda, extraModules, methodstr, displayMode, backend = None): + def __init__(self, anaconda, extraModules, displayMode, backend = None): self.displayMode = displayMode self.instLanguage = language.Language(self.displayMode) @@ -289,5 +286,4 @@ class InstallData: self.extraModules = extraModules self.fsset = fsset.FileSystemSet() - self.methodstr = methodstr self.reset() |