netgod / rpms / anaconda

Forked from rpms/anaconda 2 years ago
Clone
Blob Blame History Raw
From 4158c741f889513aff3ee0918c3d38273a8f3a60 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 25 Apr 2014 08:37:09 -0400
Subject: [PATCH 07/20] install: Move Payload postInstall() after bootloader

None of the current Payload subclasses are sensitive to ordering with
respect to the bootloader.  The forthcoming OSTreePayload class will
require postprocessing of the bootloader, so let's just swap the
ordering.

Resolves: rhbz#1113535
Port of rpmostreepayload patches from master
commit f433850099e98eee50ae995d0a864b86619ee84f
---
 pyanaconda/install.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index db66e78..8068bf0 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -172,12 +172,12 @@ def doInstall(storage, payload, ksdata, instClass):
     if flags.flags.livecdInstall:
         storage.write()
 
-    with progress_report(_("Performing post-installation setup tasks")):
-        payload.postInstall()
-
     # Do bootloader.
     if not flags.flags.dirInstall:
         with progress_report(_("Installing bootloader")):
             writeBootLoader(storage, payload, instClass, ksdata)
 
+    with progress_report(_("Performing post-installation setup tasks")):
+        payload.postInstall()
+
     progressQ.send_complete()
-- 
1.9.3