diff options
Diffstat (limited to 'pyanaconda/__init__.py')
| -rw-r--r-- | pyanaconda/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py index b21754793..0b8119b87 100644 --- a/pyanaconda/__init__.py +++ b/pyanaconda/__init__.py @@ -30,11 +30,11 @@ import os, time, string import sys -from pyanaconda.storage import arch -import isys from constants import ROOT_PATH from tempfile import mkstemp +from pyanaconda.bootloader import get_bootloader + import logging log = logging.getLogger("anaconda") stdoutLog = logging.getLogger("anaconda.stdout") @@ -71,7 +71,9 @@ class Anaconda(object): self.rescue = False self.rescue_mount = True self.rootParts = None - self.simpleFilter = not arch.isS390() + + # use os.uname because it's too early to be importing storage + self.simpleFilter = not os.uname()[4].startswith('s390') self.stage2 = None self._storage = None self.updateSrc = None @@ -85,7 +87,7 @@ class Anaconda(object): @property def bootloader(self): if not self._bootloader: - self._bootloader = self.platform.bootloaderClass(self.platform) + self._bootloader = get_bootloader(self.platform) return self._bootloader |