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

[PATCH] The justConfigFile parameter doesn't do anything on x86, either (#568567).



My previous comments were wrong - we can determine that justConfigFile is
useless here as well with the death of flags.setupFilesystems and eliminate
it.
---
 booty/x86.py |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/booty/x86.py b/booty/x86.py
index d36914b..14bd641 100644
--- a/booty/x86.py
+++ b/booty/x86.py
@@ -200,7 +200,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
         return self.runGrubInstall(instRoot, bootDev.name, cmds, cfPath)
 
     def writeGrub(self, instRoot, bl, kernelList, chainList,
-            defaultDev, justConfigFile, upgrade=False):
+            defaultDev, upgrade=False):
 
         rootDev = self.storage.rootDevice
         grubTarget = bl.getDevice()
@@ -225,14 +225,11 @@ class x86BootloaderInfo(efiBootloaderInfo):
         usedDevs.update(self.getPhysicalDevices(bootDev.name))
         usedDevs.update([dev for (label, longlabel, dev) in chainList if longlabel])
 
-        if not justConfigFile or not upgrade:
+        if not upgrade:
             self.writeDeviceMap(instRoot, usedDevs, upgrade)
             self.writeSysconfig(instRoot, grubTarget, upgrade)
 
-        if not justConfigFile:
-            return self.installGrub(instRoot, bootDev, grubTarget, grubPath, cfPath)
-
-        return 0
+        return self.installGrub(instRoot, bootDev, grubTarget, grubPath, cfPath)
 
     def writeGrubConf(self, instRoot, bootDev, rootDev, defaultDev, kernelList,
                       chainList, grubTarget, grubPath, cfPath):
-- 
1.6.5.1


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