|
 |
fbcaed |
From 84331d93435fb84b7e22b4a248a8495390c5f6ba Mon Sep 17 00:00:00 2001
|
|
|
fbcaed |
From: Chris Lumens <clumens@redhat.com>
|
|
|
fbcaed |
Date: Thu, 5 Jun 2014 10:49:36 -0400
|
|
|
fbcaed |
Subject: [PATCH 13/20] format.setup in blivet takes only kwargs.
|
|
|
fbcaed |
|
|
|
fbcaed |
Resolves: rhbz#1113535
|
|
|
fbcaed |
Port of rpmostreepayload patches from master
|
|
|
fbcaed |
commit 6d682319baff79fad351688c45ae06f69c1315c5
|
|
|
fbcaed |
---
|
|
|
fbcaed |
pyanaconda/install.py | 4 ++--
|
|
|
fbcaed |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
fbcaed |
|
|
|
fbcaed |
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
|
|
|
fbcaed |
index d771f5b..959878b 100644
|
|
|
fbcaed |
--- a/pyanaconda/install.py
|
|
|
fbcaed |
+++ b/pyanaconda/install.py
|
|
|
fbcaed |
@@ -116,7 +116,7 @@ def moveBootMntToPhysical(storage):
|
|
|
fbcaed |
return
|
|
|
fbcaed |
bootmnt.format.teardown()
|
|
|
fbcaed |
bootmnt.teardown()
|
|
|
fbcaed |
- bootmnt.format.setup(bootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
|
|
|
fbcaed |
+ bootmnt.format.setup(options=bootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
|
|
|
fbcaed |
|
|
|
fbcaed |
def doInstall(storage, payload, ksdata, instClass):
|
|
|
fbcaed |
"""Perform an installation. This method takes the ksdata as prepared by
|
|
|
fbcaed |
@@ -198,7 +198,7 @@ def doInstall(storage, payload, ksdata, instClass):
|
|
|
fbcaed |
# Explicitly mount the root on the physical sysroot
|
|
|
fbcaed |
rootmnt = storage.mountpoints.get('/')
|
|
|
fbcaed |
rootmnt.setup()
|
|
|
fbcaed |
- rootmnt.format.setup(rootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
|
|
|
fbcaed |
+ rootmnt.format.setup(options=rootmnt.format.options, chroot=iutil.getTargetPhysicalRoot())
|
|
|
fbcaed |
|
|
|
fbcaed |
payload.prepareMountTargets(storage)
|
|
|
fbcaed |
|
|
|
fbcaed |
--
|
|
|
fbcaed |
1.9.3
|
|
|
fbcaed |
|