summaryrefslogtreecommitdiffstats
path: root/pyanaconda/packaging/livepayload.py
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2013-01-14 17:48:37 -0600
committerDavid Lehman <dlehman@redhat.com>2013-01-28 13:15:31 -0600
commit9040049d8d232eae3f0f51ffe442dbe49d273bce (patch)
tree5966597dd00948b4eae345a9dc8b509ebb0dab00 /pyanaconda/packaging/livepayload.py
parente6c6261e1d7e912103ef1618e4a84c5f70abb00a (diff)
downloadanaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.tar.gz
anaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.tar.xz
anaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.zip
Remove the storage module and replace it with blivet.
Diffstat (limited to 'pyanaconda/packaging/livepayload.py')
-rw-r--r--pyanaconda/packaging/livepayload.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index 26c573ff9..73fc3326a 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -46,8 +46,8 @@ log = logging.getLogger("anaconda")
from pyanaconda.errors import *
from pyanaconda import progress
-from pyanaconda.storage.size import Size
-from pyanaconda.storage import util
+from blivet.size import Size
+import blivet.util
from pyanaconda.threads import threadMgr, AnacondaThread
import gettext
@@ -64,7 +64,7 @@ class LiveImagePayload(ImagePayload):
exn = PayloadSetupError("%s is not a valid block device" % (self.data.method.partition,))
if errorHandler.cb(exn) == ERROR_RAISE:
raise exn
- util.mount(osimg.path, INSTALL_TREE, fstype="auto", options="ro")
+ blivet.util.mount(osimg.path, INSTALL_TREE, fstype="auto", options="ro")
def preInstall(self, packages=None, groups=None):
""" Perform pre-installation tasks. """
@@ -128,7 +128,7 @@ class LiveImagePayload(ImagePayload):
def postInstall(self):
""" Perform post-installation tasks. """
progress.send_message(_("Performing post-install setup tasks"))
- util.umount(INSTALL_TREE)
+ blivet.util.umount(INSTALL_TREE)
super(LiveImagePayload, self).postInstall()
self._recreateInitrds()