[anaconda][PATCHv2] Adapt to autopart and installation-specific code move in blivet
Vratislav Podzimek
vpodzime at redhat.com
Thu Feb 12 11:14:35 UTC 2015
We need to update our import paths.
Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
pyanaconda/installclass.py | 4 ++--
pyanaconda/kickstart.py | 9 +++++----
pyanaconda/ui/gui/spokes/custom.py | 5 ++---
pyanaconda/ui/gui/spokes/storage.py | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 7a3f9a7..d7ec1db 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -26,7 +26,7 @@ import os, sys
import imputil
from blivet.partspec import PartSpec
-from blivet.devicelibs import swap
+from blivet.autopart import swapSuggestion
from blivet.platform import platform
from blivet.size import Size
@@ -104,7 +104,7 @@ class BaseInstallClass(object):
disk_space = getAvailableDiskSpace(storage)
- swp = swap.swapSuggestion(disk_space=disk_space)
+ swp = swapSuggestion(disk_space=disk_space)
autorequests.append(PartSpec(fstype="swap", size=swp, grow=False,
lv=True, encrypted=True))
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 97c2932..9c70146 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -29,6 +29,7 @@ from blivet.partitioning import growLVM
from blivet.errors import PartitioningError, StorageError, BTRFSValueError
from blivet.size import Size, KiB
from blivet import udev
+from blivet import autopart
from blivet.platform import platform
import blivet.iscsi
import blivet.fcoe
@@ -252,7 +253,7 @@ def refreshAutoSwapSize(storage):
for request in storage.autoPartitionRequests:
if request.fstype == "swap":
disk_space = getAvailableDiskSpace(storage)
- request.size = swap_suggestion(disk_space=disk_space)
+ request.size = autopart.swapSuggestion(disk_space=disk_space)
break
###
@@ -302,7 +303,7 @@ class AutoPart(commands.autopart.F21_AutoPart):
return retval
def execute(self, storage, ksdata, instClass):
- from blivet.partitioning import doAutoPartition
+ from blivet.autopart import doAutoPartition
from pyanaconda.storage_utils import sanity_check
if not self.autopart:
@@ -825,7 +826,7 @@ class LogVolData(commands.logvol.F21_LogVolData):
self.mountpoint = ""
if self.recommended or self.hibernation:
disk_space = getAvailableDiskSpace(storage)
- size = swap_suggestion(hibernation=self.hibernation, disk_space=disk_space)
+ size = autopart.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
self.grow = False
else:
if self.fstype != "":
@@ -1095,7 +1096,7 @@ class PartitionData(commands.partition.F18_PartData):
self.mountpoint = ""
if self.recommended or self.hibernation:
disk_space = getAvailableDiskSpace(storage)
- size = swap_suggestion(hibernation=self.hibernation, disk_space=disk_space)
+ size = autopart.swapSuggestion(hibernation=self.hibernation, disk_space=disk_space)
self.grow = False
# if people want to specify no mountpoint for some reason, let them
# this is really needed for pSeries boot partitions :(
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index c051055..193a379 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -46,7 +46,6 @@ from blivet.formats import device_formats
from blivet.formats import getFormat
from blivet.formats.fs import FS
from blivet.size import Size
-from blivet import Root
from blivet.devicefactory import DEVICE_TYPE_LVM
from blivet.devicefactory import DEVICE_TYPE_BTRFS
from blivet.devicefactory import DEVICE_TYPE_PARTITION
@@ -54,8 +53,8 @@ from blivet.devicefactory import DEVICE_TYPE_MD
from blivet.devicefactory import DEVICE_TYPE_DISK
from blivet.devicefactory import DEVICE_TYPE_LVM_THINP
from blivet.devicefactory import SIZE_POLICY_AUTO
-from blivet import findExistingInstallations
-from blivet.partitioning import doAutoPartition
+from blivet.osinstall import findExistingInstallations, Root
+from blivet.autopart import doAutoPartition
from blivet.errors import StorageError
from blivet.errors import NoDisksError
from blivet.errors import NotEnoughFreeSpaceError
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index bd1a826..4b9a14a 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -56,11 +56,11 @@ from pyanaconda.ui.helpers import StorageChecker
from pyanaconda.kickstart import doKickstartStorage, refreshAutoSwapSize, resetCustomStorageData
from blivet import arch
+from blivet import autopart
from blivet.size import Size
from blivet.devices import MultipathDevice, ZFCPDiskDevice
from blivet.errors import StorageError, DasdFormatError
from blivet.platform import platform
-from blivet.devicelibs import swap as swap_lib
from blivet.devicelibs.dasd import make_unformatted_dasd_list, format_dasd
from pyanaconda.threads import threadMgr, AnacondaThread
from pyanaconda.product import productName
@@ -798,7 +798,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if self.autopart and auto_swap == Size(0):
# autopartitioning requested, but not applied yet (=> no auto swap
# requests), ask user for enough space to fit in the suggested swap
- auto_swap = swap_lib.swapSuggestion()
+ auto_swap = autopart.swapSuggestion()
log.debug("disk free: %s fs free: %s sw needs: %s auto swap: %s",
disk_free, fs_free, required_space, auto_swap)
--
2.1.0
More information about the anaconda-patches
mailing list