---
iw/upgrade_migratefs_gui.py | 2 +-
storage/__init__.py | 4 +++-
upgrade.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index d71e3d8..42397cf 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -57,7 +57,7 @@ class UpgradeMigrateFSWindow (InstallWindow):
def getScreen (self, anaconda):
self.devicetree = anaconda.id.storage.devicetree
self.fsset = anaconda.id.storage.fsset
- self.migent = self.fsset.getMigratableEntries()
+ self.migent = self.fsset.migratableDevices
box = gtk.VBox (False, 5)
box.set_border_width (5)
diff --git a/storage/__init__.py b/storage/__init__.py
index 4d8c13b..a28e921 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -32,6 +32,7 @@ import isys
import iutil
from constants import *
from pykickstart.constants import *
+from flags import flags
import storage_log
from errors import *
@@ -864,10 +865,11 @@ def findExistingRootDevices(anaconda, upgradeany=False):
return rootDevs
-def mountExistingSystem(anaconda, rootDevice,
+def mountExistingSystem(anaconda, rootEnt,
allowDirty=None, warnDirty=None,
readOnly=None):
""" Mount filesystems specified in rootDevice's /etc/fstab file. """
+ rootDevice = rootEnt[0]
rootPath = anaconda.rootPath
fsset = anaconda.id.storage.fsset
if readOnly:
diff --git a/upgrade.py b/upgrade.py
index fc025a5..7cb2f5d 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -163,7 +163,7 @@ def bindMountDevDirectory(instPath):
# returns None if no filesystem exist to migrate
def upgradeMigrateFind(anaconda):
- migents = anaconda.id.storage.fsset.getMigratableEntries()
+ migents = anaconda.id.storage.fsset.migratableDevices
if not migents or len(migents) < 1:
anaconda.dispatch.skipStep("upgrademigratefs")
else:
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
