[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 4/7] Make Platform.bootloaderClass public since we use it that way.



---
 pyanaconda/__init__.py |    2 +-
 pyanaconda/platform.py |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py
index ff51e31..908805d 100644
--- a/pyanaconda/__init__.py
+++ b/pyanaconda/__init__.py
@@ -102,7 +102,7 @@ class Anaconda(object):
     @property
     def bootloader(self):
         if not self._bootloader:
-            self._bootloader = self.platform._bootloaderClass(self.storage)
+            self._bootloader = self.platform.bootloaderClass(self.platform)
 
         return self._bootloader
 
diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py
index 66a6840..f0df406 100644
--- a/pyanaconda/platform.py
+++ b/pyanaconda/platform.py
@@ -42,7 +42,7 @@ class Platform(object):
     _minimumSector = 0
     _packages = []
 
-    _bootloaderClass = bootloader.BootLoader
+    bootloaderClass = bootloader.BootLoader
     # requirements for bootloader stage1 devices
     _boot_stage1_device_types = []
     _boot_stage1_format_types = []
@@ -142,7 +142,7 @@ class Platform(object):
             return 0
 
 class X86(Platform):
-    _bootloaderClass = bootloader.GRUB2
+    bootloaderClass = bootloader.GRUB2
     _boot_stage1_device_types = ["disk"]
     _boot_mbr_description = N_("Master Boot Record")
     _boot_descriptions = {"disk": _boot_mbr_description,
@@ -183,7 +183,7 @@ class X86(Platform):
             self._disklabel_types.remove("gpt")
 
 class EFI(Platform):
-    _bootloaderClass = bootloader.EFIGRUB
+    bootloaderClass = bootloader.EFIGRUB
 
     _boot_stage1_format_types = ["efi"]
     _boot_stage1_device_types = ["partition", "mdarray"]
@@ -217,7 +217,7 @@ class EFI(Platform):
 
 class PPC(Platform):
     _ppcMachine = iutil.getPPCMachine()
-    _bootloaderClass = bootloader.Yaboot
+    bootloaderClass = bootloader.Yaboot
     _boot_stage1_device_types = ["partition"]
 
     @property
@@ -225,7 +225,7 @@ class PPC(Platform):
         return self._ppcMachine
 
 class IPSeriesPPC(PPC):
-    _bootloaderClass = bootloader.IPSeriesYaboot
+    bootloaderClass = bootloader.IPSeriesYaboot
     _boot_stage1_format_types = ["prepboot"]
     _boot_stage1_max_end_mb = 10
     _boot_prep_description = N_("PReP Boot Partition")
@@ -249,7 +249,7 @@ class IPSeriesPPC(PPC):
             return 0
 
 class NewWorldPPC(PPC):
-    _bootloaderClass = bootloader.MacYaboot
+    bootloaderClass = bootloader.MacYaboot
     _boot_stage1_format_types = ["appleboot"]
     _boot_apple_description = N_("Apple Bootstrap Partition")
     _boot_descriptions = {"partition": _boot_apple_description}
@@ -276,7 +276,7 @@ class PS3(PPC):
     pass
 
 class S390(Platform):
-    _bootloaderClass = bootloader.ZIPL
+    bootloaderClass = bootloader.ZIPL
     _packages = ["s390utils"]
     _disklabel_types = ["msdos", "dasd"]
     _boot_stage1_device_types = ["disk", "partition"]
@@ -299,7 +299,7 @@ class S390(Platform):
         return super(S390, self).requiredDiskLabelType(device_type)
 
 class Sparc(Platform):
-    _bootloaderClass = bootloader.SILO
+    bootloaderClass = bootloader.SILO
     _boot_stage1_format_types = []
     _boot_stage1_mountpoints = []
     _boot_stage1_max_end_mb = None
-- 
1.7.8.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]