diff options
| author | David Lehman <dlehman@redhat.com> | 2009-02-23 12:18:18 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-02-23 12:18:18 -0600 |
| commit | bb5ad8aa8c5e2f4d6234a5b545fd8bea53b560ee (patch) | |
| tree | ec3ce3f770cebb9d08b55d4465b8332f990d8d56 | |
| parent | e95be86ccde6c4997fd87729cc655c9072f865fd (diff) | |
| download | anaconda-bb5ad8aa8c5e2f4d6234a5b545fd8bea53b560ee.tar.gz anaconda-bb5ad8aa8c5e2f4d6234a5b545fd8bea53b560ee.tar.xz anaconda-bb5ad8aa8c5e2f4d6234a5b545fd8bea53b560ee.zip | |
Return device instances, not paths, from findExistingRoots.
| -rw-r--r-- | storage/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/__init__.py b/storage/__init__.py index e44a8b825..cd890fb2d 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -543,7 +543,7 @@ def findExistingRootDevices(anaconda, upgradeany=False): if os.access(anaconda.rootPath + "/etc/fstab", os.R_OK): relstr = getReleaseString(anaconda.rootPath) if upgradeany or productMatches(relstr, productName): - rootDevs.append((device.path, relstr)) + rootDevs.append((device, relstr)) # this handles unmounting the filesystem device.teardown(recursive=True) @@ -561,7 +561,7 @@ def mountExistingSystem(anaconda, rootDevice, else: readOnly = "" - if rootDevice.path in anaconda.id.storage.protectedPartitions and \ + if rootDevice.name in anaconda.id.storage.protectedPartitions and \ os.path.ismount("/mnt/isodir"): isys.mount("/mnt/isodir", rootPath, |