---
pyanaconda/__init__.py | 6 +-----
pyanaconda/dispatch.py | 1 -
pyanaconda/installclass.py | 5 ++---
pyanaconda/installclasses/rhel.py | 2 +-
pyanaconda/iutil.py | 5 +++--
pyanaconda/packages.py | 2 +-
pyanaconda/yuminstall.py | 2 +-
7 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py
index 400c059..4a0edba 100644
--- a/pyanaconda/__init__.py
+++ b/pyanaconda/__init__.py
@@ -102,11 +102,7 @@ class Anaconda(object):

@property
def bootloader(self):
- if not self._bootloader:
- import booty
- self._bootloader = booty.getBootloader(self)
-
- return self._bootloader
+ return self.platform.bootloader

@property
def firstboot(self):
diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
index f111f84..c67e96a 100644
--- a/pyanaconda/dispatch.py
+++ b/pyanaconda/dispatch.py
@@ -92,7 +92,6 @@ installSteps = [
("storagedone", storageComplete, ),
("enablefilesystems", turnOnFilesystems, ),
("upgbootloader", ),
- ("bootloadersetup", bootloaderSetupChoices, ),
("bootloader", ),
("reposetup", doBackendSetup, ),
("tasksel", ),
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 8fd20b5..194b8d9 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -54,7 +54,7 @@ class BaseInstallClass(object):
# default to showing the upgrade option
showUpgrade = True
bootloaderTimeoutDefault = None
- bootloaderExtraArgs = ""
+ bootloaderExtraArgs = []
_l10n_domain = None

# list of of (txt, grplist) tuples for task selection screen
@@ -96,7 +96,6 @@ class BaseInstallClass(object):
"autopartitionexecute",
"partition",
"storagedone",
- "bootloadersetup",
"bootloader",
"network",
"timezone",
@@ -192,7 +191,7 @@ class BaseInstallClass(object):

def configure(self, anaconda):
anaconda.bootloader.timeout = self.bootloaderTimeoutDefault
- anaconda.bootloader.args.append(self.bootloaderExt raArgs)
+ anaconda.bootloader.boot_args.extend(self.bootload erExtraArgs)

def versionMatches(self, oldver):
pass
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
index c41e00d..ae7b655 100644
--- a/pyanaconda/installclasses/rhel.py
+++ b/pyanaconda/installclasses/rhel.py
@@ -39,7 +39,7 @@ class InstallClass(BaseInstallClass):
hidden = 1

bootloaderTimeoutDefault = 5
- bootloaderExtraArgs = "crashkernel=auto"
+ bootloaderExtraArgs = ["crashkernel=auto"]

tasks = [(N_("Minimal"),
["core"])]
diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py
index 6495993..a004ae0 100644
--- a/pyanaconda/iutil.py
+++ b/pyanaconda/iutil.py
@@ -833,8 +833,9 @@ def numeric_type(num):
return num

def reIPL(anaconda, loader_pid):
- ipldev = anaconda.bootloader.getDevice()
- if not ipldev:
+ try:
+ ipldev = anaconda.bootloader.stage1_device.name
+ except AttributeError:
message = _("Error determining boot device's disk name")
log.warning(message)
return message
diff --git a/pyanaconda/packages.py b/pyanaconda/packages.py
index a3e561a..35f4b62 100644
--- a/pyanaconda/packages.py
+++ b/pyanaconda/packages.py
@@ -284,7 +284,7 @@ def rpmSetupGraphicalSystem(anaconda):
if iutil.isConsoleOnVirtualTerminal() and
(ts.dbMatch('provides', 'rhgb').count() or
ts.dbMatch('provides', 'plymouth').count()):
- anaconda.bootloader.args.append("rhgb quiet")
+ anaconda.bootloader.boot_args.extend(["rhgb", "quiet"])

if ts.dbMatch('provides', 'service(graphical-login)').count() and
ts.dbMatch('provides', 'xorg-x11-server-Xorg').count() and
diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
index e3fa782..fc3c3dc 100644
--- a/pyanaconda/yuminstall.py
+++ b/pyanaconda/yuminstall.py
@@ -361,7 +361,7 @@ class AnacondaYum(yum.YumBase):
exception)

self.doConfigSetup(root=self.anaconda.rootPath)
- if not self.anaconda.bootloader.doUpgradeOnly:
+ if not self.anaconda.bootloader.update_only:
self.conf.installonlypkgs = []

def _mountInstallCD(self):
--
1.7.3.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list