diff options
| author | Jesse Keating <jkeating@redhat.com> | 2012-08-23 17:13:19 -0700 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2012-08-24 07:10:32 -0700 |
| commit | d82ee4a818be9db7b65282fad7de3c8bf872a6f3 (patch) | |
| tree | 694df8813648eac9a350f6922f266a98e9a54d37 /pyanaconda/packaging | |
| parent | d3fdca83536ff0aadc9065451fbb3a264c0bf3bf (diff) | |
| download | anaconda-d82ee4a818be9db7b65282fad7de3c8bf872a6f3.tar.gz anaconda-d82ee4a818be9db7b65282fad7de3c8bf872a6f3.tar.xz anaconda-d82ee4a818be9db7b65282fad7de3c8bf872a6f3.zip | |
Only use mounted media that has repodata
This recovers some logic from yuminstall.py, only use /run/install/repo
if there is metadata there.
This is related to bug 851274 , but only fixes part of it. It gets
booting from boot.iso working again, but leaves booting from DVD broken.
Diffstat (limited to 'pyanaconda/packaging')
| -rw-r--r-- | pyanaconda/packaging/yumpayload.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 28f728da4..c62e92651 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -553,10 +553,11 @@ reposdir=%s # Did dracut leave the DVD mounted for us? device = get_mount_device("/run/install/repo") if device: - self.install_device = storage.devicetree.getDeviceByPath(device) - url = "file:///run/install/repo" - if not method.method: - method.method = "cdrom" + 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" else: # cdrom or no method specified -- check for media device = opticalInstallMedia(storage.devicetree) |