|
 |
fbcaed |
From 4158c741f889513aff3ee0918c3d38273a8f3a60 Mon Sep 17 00:00:00 2001
|
|
|
fbcaed |
From: Colin Walters <walters@verbum.org>
|
|
|
fbcaed |
Date: Fri, 25 Apr 2014 08:37:09 -0400
|
|
|
fbcaed |
Subject: [PATCH 07/20] install: Move Payload postInstall() after bootloader
|
|
|
fbcaed |
|
|
|
fbcaed |
None of the current Payload subclasses are sensitive to ordering with
|
|
|
fbcaed |
respect to the bootloader. The forthcoming OSTreePayload class will
|
|
|
fbcaed |
require postprocessing of the bootloader, so let's just swap the
|
|
|
fbcaed |
ordering.
|
|
|
fbcaed |
|
|
|
fbcaed |
Resolves: rhbz#1113535
|
|
|
fbcaed |
Port of rpmostreepayload patches from master
|
|
|
fbcaed |
commit f433850099e98eee50ae995d0a864b86619ee84f
|
|
|
fbcaed |
---
|
|
|
fbcaed |
pyanaconda/install.py | 6 +++---
|
|
|
fbcaed |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
fbcaed |
|
|
|
fbcaed |
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
|
|
|
fbcaed |
index db66e78..8068bf0 100644
|
|
|
fbcaed |
--- a/pyanaconda/install.py
|
|
|
fbcaed |
+++ b/pyanaconda/install.py
|
|
|
fbcaed |
@@ -172,12 +172,12 @@ def doInstall(storage, payload, ksdata, instClass):
|
|
|
fbcaed |
if flags.flags.livecdInstall:
|
|
|
fbcaed |
storage.write()
|
|
|
fbcaed |
|
|
|
fbcaed |
- with progress_report(_("Performing post-installation setup tasks")):
|
|
|
fbcaed |
- payload.postInstall()
|
|
|
fbcaed |
-
|
|
|
fbcaed |
# Do bootloader.
|
|
|
fbcaed |
if not flags.flags.dirInstall:
|
|
|
fbcaed |
with progress_report(_("Installing bootloader")):
|
|
|
fbcaed |
writeBootLoader(storage, payload, instClass, ksdata)
|
|
|
fbcaed |
|
|
|
fbcaed |
+ with progress_report(_("Performing post-installation setup tasks")):
|
|
|
fbcaed |
+ payload.postInstall()
|
|
|
fbcaed |
+
|
|
|
fbcaed |
progressQ.send_complete()
|
|
|
fbcaed |
--
|
|
|
fbcaed |
1.9.3
|
|
|
fbcaed |
|