With flags.setupFilesystems gone, justConfig can be removed from booty.

...well, it can mostly be removed.  The s390 and x86 classes still do some
complicated things that end up with a justConfig test, so it has to stay
in those files.  However, their write() methods no longer need to accept
that parameter.

1 files changed, 32 insertions, 34 deletions

diff --git a/booty/alpha.py b/booty/alpha.py
index da9f839d9..6fd8a195a 100644
--- a/booty/alpha.py
+++ b/booty/alpha.py
@@ -17,7 +17,7 @@ class alphaBootloaderInfo(bootloaderInfo):
         return partitionNumber + 1
 
     def writeAboot(self, instRoot, bl, kernelList,
-                   chainList, defaultDev, justConfig):
+                   chainList, defaultDev):
         rootDevice = self.storage.rootDevice
         try:
             bootDevice = self.storage.mountpoints["/boot"]
@@ -100,47 +100,45 @@ class alphaBootloaderInfo(bootloaderInfo):
         f.close ()
         del f
 
-        if not justConfig:
-            # Now we're ready to write the relevant boot information. wbd
-            # is the whole boot device, bdpn is the boot device partition
-            # number.
-            wbd = self.wholeDevice (bootDevice.path)
-            bdpn = self.partitionNum (bootDevice.path)
-
-            # Calling swriteboot. The first argument is the disk to write
-            # to and the second argument is a path to the bootstrap loader
-            # file.
-            args = [("/dev/%s" % wbd), "/boot/bootlx"]
-            rc = iutil.execWithRedirect ('/sbin/swriteboot', args,
-                                         root = instRoot,
-                                         stdout = "/dev/tty5",
-                                         stderr = "/dev/tty5")
-            if rc:
-                return rc
-
-            # Calling abootconf to configure the installed aboot. The
-            # first argument is the disk to use, the second argument is
-            # the number of the partition on which aboot.conf resides.
-            # It's always the boot partition whether it's / or /boot (with
-            # the mount point being omitted.)
-            args = [("/dev/%s" % wbd), str (bdpn)]
-            rc = iutil.execWithRedirect ('/sbin/abootconf', args,
-                                         root = instRoot,
-                                         stdout = "/dev/tty5",
-                                         stderr = "/dev/tty5")
-            if rc:
-                return rc
+        # Now we're ready to write the relevant boot information. wbd
+        # is the whole boot device, bdpn is the boot device partition
+        # number.
+        wbd = self.wholeDevice (bootDevice.path)
+        bdpn = self.partitionNum (bootDevice.path)
+
+        # Calling swriteboot. The first argument is the disk to write
+        # to and the second argument is a path to the bootstrap loader
+        # file.
+        args = [("/dev/%s" % wbd), "/boot/bootlx"]
+        rc = iutil.execWithRedirect ('/sbin/swriteboot', args,
+                                     root = instRoot,
+                                     stdout = "/dev/tty5",
+                                     stderr = "/dev/tty5")
+        if rc:
+            return rc
+
+        # Calling abootconf to configure the installed aboot. The
+        # first argument is the disk to use, the second argument is
+        # the number of the partition on which aboot.conf resides.
+        # It's always the boot partition whether it's / or /boot (with
+        # the mount point being omitted.)
+        args = [("/dev/%s" % wbd), str (bdpn)]
+        rc = iutil.execWithRedirect ('/sbin/abootconf', args,
+                                     root = instRoot,
+                                     stdout = "/dev/tty5",
+                                     stderr = "/dev/tty5")
+        if rc:
+            return rc
 
         return 0
 
 
-    def write(self, instRoot, bl, kernelList, chainList,
-            defaultDev, justConfig):
+    def write(self, instRoot, bl, kernelList, chainList, defaultDev):
         if len(kernelList) < 1:
             raise BootyNoKernelWarning
 
         return self.writeAboot(instRoot, bl, kernelList,
-                               chainList, defaultDev, justConfig)
+                               chainList, defaultDev)
 
     def __init__(self, instData):
         bootloaderInfo.__init__(self, instData)