Remove all uses of fsset.getEntryByMountPoint.

1 files changed, 23 insertions, 20 deletions

diff --git a/booty/ppc.py b/booty/ppc.py
index 24a5df8fa..bf92e71e3 100644
--- a/booty/ppc.py
+++ b/booty/ppc.py
@@ -27,40 +27,43 @@ class ppcBootloaderInfo(bootloaderInfo):
         if len(devs) == 0:
             # Try to get a boot device; bplan OF understands ext3
             if machine == 'Pegasos' or machine == 'Efika':
-                entry = fs.getEntryByMountPoint('/boot')
-                # Try / if we don't have this we're not going to work
-                if not entry:
-                    entry = fs.getEntryByMountPoint('/')
-                if entry:
-                    dev = "/dev/%s" % (entry.device.getDevice(asBoot=1),)
-                    devs.append(dev)
+                try:
+                    device = storage.fsset.mountpoints["/boot"]
+                except KeyError:
+                    try:
+                        # Try / if we don't have this we're not going to work
+                        device = storage.fsset.mountpoints["/"]
+                    except KeyError:
+                        return devs
+
+                devs.append(device.path)
             else:
                 if bl.getDevice():
                     devs.append("/dev/%s" % bl.getDevice())
         return devs
 
 
-    def writeYaboot(self, instRoot, fsset, bl, kernelList, 
+    def writeYaboot(self, instRoot, bl, kernelList, 
                   chainList, defaultDev, justConfigFile):
 
-        yabootTarget = string.join(self.getBootDevs(fsset, bl))
+        yabootTarget = string.join(self.getBootDevs(bl))
+
+        try:
+            bootDev = storage.fsset.mountpoints["/boot"]
 
-        bootDev = fsset.getEntryByMountPoint("/boot")
-        if bootDev:
             cf = "/boot/etc/yaboot.conf"
             cfPath = ""
             if not os.path.isdir(instRoot + "/boot/etc"):
                 os.mkdir(instRoot + "/boot/etc")
-        else:
-            bootDev = fsset.getEntryByMountPoint("/")
+        except KeyError:
+            bootDev = storage.fsset.mountpoints["/"]
+
             cfPath = "/boot"
             cf = "/etc/yaboot.conf"
-        bootDev = bootDev.device.getDevice(asBoot = 1)
 
         f = open(instRoot + cf, "w+")
 
         f.write("# yaboot.conf generated by anaconda\n\n")
-        
         f.write("boot=%s\n" %(yabootTarget,))
         f.write("init-message=\"Welcome to %s!\\nHit <TAB> for boot options\"\n\n"
                 % productName)
@@ -105,8 +108,8 @@ class ppcBootloaderInfo(bootloaderInfo):
             f.write("restricted\n")
 
         f.write("\n")
-        
-        rootDev = fsset.getEntryByMountPoint("/").device.getDevice()
+
+        rootDev = storage.fsset.mountpoints["/"]
 
         for (label, longlabel, version) in kernelList:
             kernelTag = "-" + version
@@ -122,7 +125,7 @@ class ppcBootloaderInfo(bootloaderInfo):
 
             append = "%s" %(self.args.get(),)
 
-            realroot = getRootDevName(initrd, fsset, rootDev, instRoot)
+            realroot = getRootDevName(instRoot+initrd, rootDev.path)
             if rootIsDevice(realroot):
                 f.write("\troot=%s\n" %(realroot,))
             else:
@@ -165,10 +168,10 @@ class ppcBootloaderInfo(bootloaderInfo):
         # or not
         self.password = val
         
-    def write(self, instRoot, fsset, bl, kernelList, chainList,
+    def write(self, instRoot, bl, kernelList, chainList,
             defaultDev, justConfig, intf):
         if len(kernelList) >= 1:
-            out = self.writeYaboot(instRoot, fsset, bl, kernelList, 
+            out = self.writeYaboot(instRoot, bl, kernelList, 
                                  chainList, defaultDev, justConfig)
         else:
             self.noKernelsWarn(intf)