Add a storage instance to all bootloaderInfo subclasses.

We could pass storage around to all the various functions that will need it,
but that's a big mess.  It's far easier to just set this when we create the
bootloaderInfo class and never worry about it again.

1 files changed, 4 insertions, 4 deletions

diff --git a/booty/s390.py b/booty/s390.py
index a96ac0033..32d28b463 100644
--- a/booty/s390.py
+++ b/booty/s390.py
@@ -28,7 +28,7 @@ class s390BootloaderInfo(bootloaderInfo):
                 lilo.delImage(label)
 
         try:
-            rootDev = storage.fsset.mountpoints["/"]
+            rootDev = self.storage.fsset.mountpoints["/"]
         except KeyError:
             raise RuntimeError, "Installing zipl, but there is no root device"
 
@@ -124,7 +124,7 @@ class s390BootloaderInfo(bootloaderInfo):
     def writeZipl(self, instRoot, bl, kernelList, chainList,
                   defaultDev, justConfigFile):
         images = bl.images.getImages()
-        rootDev = storage.fsset.mountpoints["/"]
+        rootDev = self.storage.fsset.mountpoints["/"]
         
         cf = '/etc/zipl.conf'
         self.perms = 0600
@@ -173,8 +173,8 @@ class s390BootloaderInfo(bootloaderInfo):
                              justConfig | (not self.useZiplVal))
         out = self.writeChandevConf(bl, instRoot)
     
-    def __init__(self):
-        bootloaderInfo.__init__(self)
+    def __init__(self, storage):
+        bootloaderInfo.__init__(self, storage)
         self.useZiplVal = 1      # only used on s390
         self.kernelLocation = "/boot/"
         self.configfile = "/etc/zipl.conf"