diff options
author | Chris Lumens <clumens@redhat.com> | 2009-03-04 12:42:31 -0500 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2009-03-04 15:37:05 -0500 |
commit | d899dad616076a9c6183306c4cdcf442405c3190 (patch) | |
tree | 5b48e466818e35c028d38dfd6b31c781102a0195 | |
parent | 7f94ffba398ac4e6db7020e94cb5383cc03b8e89 (diff) | |
download | anaconda-d899dad616076a9c6183306c4cdcf442405c3190.tar.gz anaconda-d899dad616076a9c6183306c4cdcf442405c3190.tar.xz anaconda-d899dad616076a9c6183306c4cdcf442405c3190.zip |
bootloader.write takes fewer arguments now, so clean up arg passing.
-rw-r--r-- | bootloader.py | 6 | ||||
-rw-r--r-- | booty/alpha.py | 2 | ||||
-rw-r--r-- | booty/bootloaderInfo.py | 2 | ||||
-rw-r--r-- | booty/ia64.py | 2 | ||||
-rw-r--r-- | booty/ppc.py | 2 | ||||
-rw-r--r-- | booty/s390.py | 2 | ||||
-rw-r--r-- | booty/sparc.py | 2 | ||||
-rw-r--r-- | booty/x86.py | 2 |
8 files changed, 9 insertions, 11 deletions
diff --git a/bootloader.py b/bootloader.py index 9cc9cd62b..313ecdff7 100644 --- a/bootloader.py +++ b/bootloader.py @@ -186,11 +186,9 @@ def writeBootloader(anaconda): dosync() try: - anaconda.id.bootloader.write(anaconda.rootPath, anaconda.id.storage, - anaconda.id.bootloader, - anaconda.id.instLanguage, + anaconda.id.bootloader.write(anaconda.rootPath, anaconda.id.bootloader, kernelList, otherList, defaultDev, - justConfigFile, anaconda.intf) + justConfigFile) if not justConfigFile: w.pop() except booty.BootyNoKernelWarning: diff --git a/booty/alpha.py b/booty/alpha.py index 58008bea9..03f0653c9 100644 --- a/booty/alpha.py +++ b/booty/alpha.py @@ -129,7 +129,7 @@ class alphaBootloaderInfo(bootloaderInfo): def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): if len(kernelList) < 1: raise BootyNoKernelWarning diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index ec21d2b73..dd94f4024 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -420,7 +420,7 @@ class bootloaderInfo: return lilo def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf = None): + defaultDev, justConfig): if len(kernelList) >= 1: config = self.getBootloaderConfig(instRoot, bl, kernelList, chainList, diff --git a/booty/ia64.py b/booty/ia64.py index 013545fe6..b9646d3a5 100644 --- a/booty/ia64.py +++ b/booty/ia64.py @@ -21,7 +21,7 @@ class ia64BootloaderInfo(efiBootloaderInfo): return "" def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): if len(kernelList) >= 1: out = self.writeLilo(instRoot, bl, kernelList, chainList, defaultDev, justConfig) diff --git a/booty/ppc.py b/booty/ppc.py index 5092c104d..af90ef0bd 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -165,7 +165,7 @@ class ppcBootloaderInfo(bootloaderInfo): self.password = val def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): if len(kernelList) >= 1: out = self.writeYaboot(instRoot, bl, kernelList, chainList, defaultDev, justConfig) diff --git a/booty/s390.py b/booty/s390.py index 5444c5157..2c3f8a37e 100644 --- a/booty/s390.py +++ b/booty/s390.py @@ -161,7 +161,7 @@ class s390BootloaderInfo(bootloaderInfo): return "" def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): out = self.writeZipl(instRoot, bl, kernelList, chainList, defaultDev, justConfig | (not self.useZiplVal)) diff --git a/booty/sparc.py b/booty/sparc.py index f214a98e2..46c9cdbb7 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -112,7 +112,7 @@ class sparcBootloaderInfo(bootloaderInfo): self.password = val def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): if len(kernelList) >= 1: self.writeSilo(instRoot, bl, kernelList, chainList, defaultDev, justConfig) diff --git a/booty/x86.py b/booty/x86.py index 2ef765fed..a84519b13 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -517,7 +517,7 @@ class x86BootloaderInfo(efiBootloaderInfo): f.close() def write(self, instRoot, bl, kernelList, chainList, - defaultDev, justConfig, intf): + defaultDev, justConfig): if self.timeout is None and chainList: self.timeout = 5 |