[master/f20/rhel7] No longer use summary screen visit to decide whether bootloader has been configured.
mulhern
amulhern at redhat.com
Thu Oct 24 19:56:43 UTC 2013
Resolves: rhbz#916529
Previously, the code incorporated the assumption that if there had been
a kickstart install, and no bootloader information had been specified in the
kickstart file, then there was insufficient information to configure the
bootloader. Therefore, the bootloader was not considered configured until the
user had examined the bootloader choices on the summary screen. Now the same
default location is supplied for either kickstart or manual install, so the
bootloader is always considired to have been configured, even if the user
has neither examined the summary screen or explicitly specified in the
kickstart file.
The line that sets the variable self.data.bootloader.seen = True is being left
in, because it records the state, bootloader choice has been seen, correctly.
Signed-off-by: mulhern <amulhern at redhat.com>
---
pyanaconda/ui/gui/spokes/storage.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index df28311..694e9b8 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -428,11 +428,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
threadMgr.get(constants.THREAD_CHECK_STORAGE) is None and
self.storage.rootDevice is not None and
not self.errors)
-
- if flags.automatedInstall:
- return retval and self.data.bootloader.seen
- else:
- return retval
+ return retval
@property
def ready(self):
@@ -451,8 +447,6 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if flags.automatedInstall and not self.storage.rootDevice:
return msg
- elif flags.automatedInstall and not self.data.bootloader.seen:
- msg = _("No bootloader configured")
elif self.data.ignoredisk.onlyuse:
msg = P_(("%d disk selected"),
("%d disks selected"),
--
1.8.3.1
More information about the anaconda-patches
mailing list