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