diff options
| author | Jesse Keating <jkeating@redhat.com> | 2012-08-24 07:50:05 -0700 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2012-08-24 07:50:05 -0700 |
| commit | cd12605dd5b463418cdcad9751228c632a3f6a46 (patch) | |
| tree | a6a6256f29bb157fb93abac2ac964b709b6728b9 /pyanaconda/packaging | |
| parent | d82ee4a818be9db7b65282fad7de3c8bf872a6f3 (diff) | |
| download | anaconda-cd12605dd5b463418cdcad9751228c632a3f6a46.tar.gz anaconda-cd12605dd5b463418cdcad9751228c632a3f6a46.tar.xz anaconda-cd12605dd5b463418cdcad9751228c632a3f6a46.zip | |
Revert "Only use mounted media that has repodata"
This reverts commit d82ee4a818be9db7b65282fad7de3c8bf872a6f3.
There is a better way to do this.
Diffstat (limited to 'pyanaconda/packaging')
| -rw-r--r-- | pyanaconda/packaging/yumpayload.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index c62e92651..28f728da4 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -553,11 +553,10 @@ reposdir=%s # Did dracut leave the DVD mounted for us? device = get_mount_device("/run/install/repo") if device: - if os.path.isdir("/run/install/repo/os/repodata"): - self.install_device = storage.devicetree.getDeviceByPath(device) - url = "file:///run/install/repo" - if not method.method: - method.method = "cdrom" + self.install_device = storage.devicetree.getDeviceByPath(device) + url = "file:///run/install/repo" + if not method.method: + method.method = "cdrom" else: # cdrom or no method specified -- check for media device = opticalInstallMedia(storage.devicetree) |