diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-12-21 13:24:43 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-02-04 15:07:55 -0500 |
| commit | 6db11661989a865a0cf59ca2be37208b498f2b71 (patch) | |
| tree | 3d2bad7cdc9afed650da90c2c9c55138c3142f8e /iw | |
| parent | 738b76a60481881365db518cbeee7bdb677d97de (diff) | |
| download | anaconda-6db11661989a865a0cf59ca2be37208b498f2b71.tar.gz anaconda-6db11661989a865a0cf59ca2be37208b498f2b71.tar.xz anaconda-6db11661989a865a0cf59ca2be37208b498f2b71.zip | |
Move bootloader into the Anaconda object.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/blpasswidget.py | 4 | ||||
| -rw-r--r-- | iw/bootloader_main_gui.py | 2 | ||||
| -rw-r--r-- | iw/cleardisks_gui.py | 6 | ||||
| -rw-r--r-- | iw/osbootwidget.py | 2 | ||||
| -rw-r--r-- | iw/timezone_gui.py | 2 | ||||
| -rw-r--r-- | iw/upgrade_bootloader_gui.py | 2 | ||||
| -rw-r--r-- | iw/zipl_gui.py | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py index e23e07dc9..c07b4df30 100644 --- a/iw/blpasswidget.py +++ b/iw/blpasswidget.py @@ -31,9 +31,9 @@ class BootloaderPasswordWidget: self.parent = parent self.intf = anaconda.intf - if anaconda.id.bootloader.getPassword(): + if anaconda.bootloader.getPassword(): usePass = 1 - self.password = anaconda.id.bootloader.getPassword() + self.password = anaconda.bootloader.getPassword() else: usePass = 0 self.password = None diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py index b2cde964c..05588b680 100644 --- a/iw/bootloader_main_gui.py +++ b/iw/bootloader_main_gui.py @@ -188,7 +188,7 @@ class MainBootloaderWindow(InstallWindow): def getScreen(self, anaconda): self.dispatch = anaconda.dispatch - self.bl = anaconda.id.bootloader + self.bl = anaconda.bootloader self.intf = anaconda.intf self.driveorder = self.bl.drivelist diff --git a/iw/cleardisks_gui.py b/iw/cleardisks_gui.py index 032555b12..0c59a4382 100644 --- a/iw/cleardisks_gui.py +++ b/iw/cleardisks_gui.py @@ -61,14 +61,14 @@ class ClearDisksWindow (InstallWindow): cleardisks.sort(self.anaconda.storage.compareDisks) self.anaconda.storage.clearPartDisks = cleardisks - self.anaconda.id.bootloader.updateDriveList([bootDisk]) + self.anaconda.bootloader.updateDriveList([bootDisk]) def getScreen (self, anaconda): # Skip this screen as well if we only had one disk available in the # filtering UI. if len(anaconda.storage.exclusiveDisks) == 1: anaconda.storage.clearPartDisks = anaconda.storage.exclusiveDisks - anaconda.id.bootloader.drivelist = anaconda.storage.exclusiveDisks + anaconda.bootloader.drivelist = anaconda.storage.exclusiveDisks return None (xml, self.vbox) = gui.getGladeWidget("cleardisks.glade", "vbox") @@ -149,7 +149,7 @@ class ClearDisksWindow (InstallWindow): rightVisible = d in self.anaconda.storage.clearPartDisks rightActive = rightVisible and \ - d in self.anaconda.id.bootloader.drivelist[:1] + d in self.anaconda.bootloader.drivelist[:1] leftVisible = not rightVisible self.store.append(None, (device, leftVisible, True, diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py index d73786328..42fc73a39 100644 --- a/iw/osbootwidget.py +++ b/iw/osbootwidget.py @@ -35,7 +35,7 @@ class OSBootWidget: """Widget to display OSes to boot and allow adding new ones.""" def __init__(self, anaconda, parent, blname = None): - self.bl = anaconda.id.bootloader + self.bl = anaconda.bootloader self.storage = anaconda.storage self.parent = parent self.intf = anaconda.intf diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 4a6ca7983..c5ecd889d 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -105,7 +105,7 @@ class TimezoneWindow(InstallWindow): self.utcCheckbox.set_active(asUTC) if not anaconda.ksdata: - self.utcCheckbox.set_active(not hasWindows(anaconda.id.bootloader)) + self.utcCheckbox.set_active(not hasWindows(anaconda.bootloader)) self.notebook.remove(self.vbox) return self.vbox diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py index 5c96f4192..caaf2f38a 100644 --- a/iw/upgrade_bootloader_gui.py +++ b/iw/upgrade_bootloader_gui.py @@ -113,7 +113,7 @@ class UpgradeBootloaderWindow (InstallWindow): def getScreen(self, anaconda): self.dispatch = anaconda.dispatch - self.bl = anaconda.id.bootloader + self.bl = anaconda.bootloader newToLibata = self._newToLibata(anaconda.rootPath) diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py index b90eaae2b..a4c36aaa0 100644 --- a/iw/zipl_gui.py +++ b/iw/zipl_gui.py @@ -48,7 +48,7 @@ class ZiplWindow (InstallWindow): # ZiplWindow tag="zipl" def getScreen(self, anaconda): self.dispatch = anaconda.dispatch - self.bl = anaconda.id.bootloader + self.bl = anaconda.bootloader self.intf = anaconda.intf imageList = self.bl.images.getImages() |