diff options
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/__init__.py | 16 | ||||
| -rw-r--r-- | booty/alpha.py | 4 | ||||
| -rw-r--r-- | booty/bootloaderInfo.py | 17 | ||||
| -rw-r--r-- | booty/ia64.py | 4 | ||||
| -rw-r--r-- | booty/ppc.py | 4 | ||||
| -rw-r--r-- | booty/s390.py | 4 | ||||
| -rw-r--r-- | booty/sparc.py | 4 | ||||
| -rw-r--r-- | booty/x86.py | 6 |
8 files changed, 29 insertions, 30 deletions
diff --git a/booty/__init__.py b/booty/__init__.py index f0b571d39..cc4801a77 100644 --- a/booty/__init__.py +++ b/booty/__init__.py @@ -28,25 +28,25 @@ class BootyNoKernelWarning: return self.value # return instance of the appropriate bootloader for our arch -def getBootloader(instData): +def getBootloader(anaconda): """Get the bootloader info object for your architecture""" if iutil.isX86(): import x86 - return x86.x86BootloaderInfo(instData) + return x86.x86BootloaderInfo(anaconda) elif iutil.isIA64(): import ia64 - return ia64.ia64BootloaderInfo(instData) + return ia64.ia64BootloaderInfo(anaconda) elif iutil.isS390(): import s390 - return s390.s390BootloaderInfo(instData) + return s390.s390BootloaderInfo(anaconda) elif iutil.isAlpha(): import alpha - return alpha.alphaBootloaderInfo(instData) + return alpha.alphaBootloaderInfo(anaconda) elif iutil.isPPC(): import ppc - return ppc.ppcBootloaderInfo(instData) + return ppc.ppcBootloaderInfo(anaconda) elif iutil.isSparc(): import sparc - return sparc.sparcBootloaderInfo(instData) + return sparc.sparcBootloaderInfo(anaconda) else: - return bootloaderInfo(instData) + return bootloaderInfo(anaconda) diff --git a/booty/alpha.py b/booty/alpha.py index 6fd8a195a..0ed0b8af1 100644 --- a/booty/alpha.py +++ b/booty/alpha.py @@ -140,8 +140,8 @@ class alphaBootloaderInfo(bootloaderInfo): return self.writeAboot(instRoot, bl, kernelList, chainList, defaultDev) - def __init__(self, instData): - bootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + bootloaderInfo.__init__(self, anaconda) self.useGrubVal = 0 self._configdir = "/etc" self._configname = "aboot.conf" diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 21e4c4160..35e9bc9d7 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -159,11 +159,11 @@ class KernelArguments: self.appendArgs += args - def __init__(self, instData): + def __init__(self, anaconda): newArgs = [] cfgFilename = "/tmp/install.cfg" - self.anaconda = instData.anaconda + self.anaconda = anaconda if iutil.isS390(): self.cargs = [] @@ -202,7 +202,6 @@ class KernelArguments: self.args = " ".join(newArgs) self.appendArgs = "" - self.id = instData class BootImages: @@ -536,8 +535,8 @@ class bootloaderInfo(object): self._drivelist = val drivelist = property(_getDriveList, _setDriveList) - def __init__(self, instData): - self.args = KernelArguments(instData) + def __init__(self, anaconda): + self.args = KernelArguments(anaconda) self.images = BootImages() self.device = None self.defaultDevice = None # XXX hack, used by kickstart @@ -549,7 +548,7 @@ class bootloaderInfo(object): self.pure = None self.above1024 = 0 self.timeout = None - self.storage = instData.storage + self.storage = anaconda.storage # this has somewhat strange semantics. if 0, act like a normal # "install" case. if 1, update lilo.conf (since grubby won't do that) @@ -673,11 +672,11 @@ class efiBootloaderInfo(bootloaderInfo): return rc return self.addNewEfiEntry(instRoot) - def __init__(self, instData, initialize = True): + def __init__(self, anaconda, initialize = True): if initialize: - bootloaderInfo.__init__(self, instData) + bootloaderInfo.__init__(self, anaconda) else: - self.storage = instData.storage + self.storage = anaconda.storage if iutil.isEfi(): self._configdir = "/boot/efi/EFI/redhat" diff --git a/booty/ia64.py b/booty/ia64.py index b2414f475..f0f01463b 100644 --- a/booty/ia64.py +++ b/booty/ia64.py @@ -32,7 +32,7 @@ class ia64BootloaderInfo(efiBootloaderInfo): return rc return self.addNewEfiEntry(instRoot) - def __init__(self, instData): - efiBootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + efiBootloaderInfo.__init__(self, anaconda) self._configname = "elilo.conf" self._bootloader = "elilo.efi" diff --git a/booty/ppc.py b/booty/ppc.py index fbdd376ea..a64034473 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -172,8 +172,8 @@ class ppcBootloaderInfo(bootloaderInfo): return 0 - def __init__(self, instData): - bootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + bootloaderInfo.__init__(self, anaconda) self.useYabootVal = 1 self.kernelLocation = "/boot" self._configdir = "/etc" diff --git a/booty/s390.py b/booty/s390.py index 1cc6e7167..1a4c9f3d7 100644 --- a/booty/s390.py +++ b/booty/s390.py @@ -170,8 +170,8 @@ class s390BootloaderInfo(bootloaderInfo): return self.writeChandevConf(bl, instRoot) - def __init__(self, instData): - bootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + bootloaderInfo.__init__(self, anaconda) self.useZiplVal = 1 # only used on s390 self.kernelLocation = "/boot/" self._configdir = "/etc" diff --git a/booty/sparc.py b/booty/sparc.py index c7fb9d865..8b8c78ba6 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -120,8 +120,8 @@ class sparcBootloaderInfo(bootloaderInfo): else: raise BootyNoKernelWarning - def __init__(self, instData): - bootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + bootloaderInfo.__init__(self, anaconda) self.useSiloVal = 1 self.kernelLocation = "/boot" self._configdir = "/etc" diff --git a/booty/x86.py b/booty/x86.py index bc0dcf6cc..d36914b7b 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -527,15 +527,15 @@ class x86BootloaderInfo(efiBootloaderInfo): return args - def __init__(self, instData): - bootloaderInfo.__init__(self, instData) + def __init__(self, anaconda): + bootloaderInfo.__init__(self, anaconda) # these have to be set /before/ efiBootloaderInfo.__init__(), or # they'll be overwritten. self._configdir = "/boot/grub" self._configname = "grub.conf" - efiBootloaderInfo.__init__(self, instData, initialize=False) + efiBootloaderInfo.__init__(self, anaconda, initialize=False) # XXX use checkbootloader to determine what to default to self.useGrubVal = 1 |