[PATCH 04/14] Remove the last usage of fsset in getBootDevs.

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

 



From: Chris Lumens <clumens@xxxxxxxxxx>

Signed-off-by: David Cantrell <dcantrell@xxxxxxxxxx>
---
 bootloader.py |    4 ----
 instdata.py   |    4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bootloader.py b/bootloader.py
index fe8c912..00cd0e8 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -204,10 +204,6 @@ def writeBootloader(anaconda):
 
     dosync()
 
-# return instance of the appropriate bootloader for our arch
-def getBootloader():
-    return booty.getBootloader()
-
 def hasWindows(bl):
     foundWindows = False
     for (k,v) in bl.images.getImages().iteritems():
diff --git a/instdata.py b/instdata.py
index c0aaf92..1ae61bf 100644
--- a/instdata.py
+++ b/instdata.py
@@ -30,7 +30,7 @@ import firewall
 import security
 import timezone
 import desktop
-import bootloader
+import booty
 import storage
 import urllib
 import iutil
@@ -75,7 +75,7 @@ class InstallData:
         if flags.cmdline.has_key("preupgrade"):
             self.upgrade = True
         self.storage = storage.Storage(self.anaconda)
-        self.bootloader = bootloader.getBootloader()
+        self.bootloader = booty.getBootloader(self.storage)
         self.upgradeRoot = None
         self.rootParts = None
         self.upgradeSwapInfo = None
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux