summaryrefslogtreecommitdiffstats
path: root/pyanaconda/rescue.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/rescue.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/rescue.py')
-rw-r--r--pyanaconda/rescue.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index 9b3be6d52..c6750bf39 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -28,8 +28,8 @@ from flags import flags
import sys
import os
import isys
-from storage import mountExistingSystem
-from storage.errors import StorageError
+from blivet import mountExistingSystem
+from blivet.errors import StorageError
from installinterfacebase import InstallInterfaceBase
import iutil
import shutil
@@ -192,7 +192,7 @@ def runShell(screen = None, msg=""):
screen.finish()
def doRescue(rescue_mount, ksdata):
- import storage
+ import blivet
for file in [ "services", "protocols", "group", "joe", "man.config",
"nsswitch.conf", "selinux", "mke2fs.conf" ]:
@@ -242,9 +242,9 @@ def doRescue(rescue_mount, ksdata):
break
- sto = storage.Storage(ksdata)
- storage.storageInitialize(sto, ksdata, [])
- roots = storage.findExistingInstallations(sto.devicetree)
+ sto = blivet.Blivet(ksdata=ksdata)
+ blivet.storageInitialize(sto, ksdata, [])
+ roots = blivet.findExistingInstallations(sto.devicetree)
if not roots:
root = None