It just passes its arguments directly to storage.findExistingRootDevices. --- pyanaconda/rescue.py | 2 +- pyanaconda/upgrade.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py index e8a25a2..f9739c9 100644 --- a/pyanaconda/rescue.py +++ b/pyanaconda/rescue.py @@ -319,7 +319,7 @@ def runRescue(anaconda): import storage storage.storageInitialize(anaconda) - (disks, notUpgradable) = upgrade.findExistingRoots(anaconda, upgradeany=True) + (disks, notUpgradable) = storage.findExistingRootDevices(anaconda, upgradeany=True) if not disks: root = None diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py index 9aa8a37..427e7ff 100644 --- a/pyanaconda/upgrade.py +++ b/pyanaconda/upgrade.py @@ -77,8 +77,8 @@ def findRootParts(anaconda): if anaconda.dir == DISPATCH_BACK: return if anaconda.rootParts is None: - (anaconda.rootParts, notUpgradable) = findExistingRoots(anaconda, - flags.cmdline.has_key("upgradeany")) + (anaconda.rootParts, notUpgradable) = findExistingRootDevices(anaconda, + upgradeany=flags.cmdline.has_key("upgradeany")) if notUpgradable and not anaconda.rootParts: oldInstalls = "" @@ -106,9 +106,6 @@ def findRootParts(anaconda): else: anaconda.dispatch.skipStep("findinstall", skip = 1) -def findExistingRoots(anaconda, upgradeany=False): - return findExistingRootDevices(anaconda, upgradeany=upgradeany) - def bindMountDevDirectory(instPath): getFormat("bind", device="/dev", -- 1.7.3.5 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list