diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-11-16 19:55:28 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-11-16 19:55:28 +0000 |
| commit | 89d4651463e2d0e500cc275bb8ce7fd210d02ffc (patch) | |
| tree | 75ad719eb7a96d5b5267851979582b0222cde643 | |
| parent | d3e2265ca3b5f988d58971817d2c888543dc685a (diff) | |
| download | anaconda-89d4651463e2d0e500cc275bb8ce7fd210d02ffc.tar.gz anaconda-89d4651463e2d0e500cc275bb8ce7fd210d02ffc.tar.xz anaconda-89d4651463e2d0e500cc275bb8ce7fd210d02ffc.zip | |
2006-11-16 Jeremy Katz <katzj@redhat.com>
* yuminstall.py (YumBackend.kernelVersionList): With kernel not
being UP, calling it -up doesn't make sense anymore (#215746)
* bootloader.py: Likewise.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bootloader.py | 2 | ||||
| -rw-r--r-- | yuminstall.py | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2006-11-16 Jeremy Katz <katzj@redhat.com> + + * yuminstall.py (YumBackend.kernelVersionList): With kernel not + being UP, calling it -up doesn't make sense anymore (#215746) + * bootloader.py: Likewise. + 2006-11-16 Peter Jones <pjones@redhat.com> * iscsi.py (_getPortal): Treat the results of "iscsiadm -m node -p diff --git a/bootloader.py b/bootloader.py index 8bb6c1d06..12c0cae84 100644 --- a/bootloader.py +++ b/bootloader.py @@ -166,7 +166,7 @@ def writeBootloader(anaconda): kernelList.append((kernelLabel, kernelLongLabel, version)) if nick in ("hypervisor", "guest"): # XXX: *sigh* inconsistent defkern = "kernel-xen-%s" %(nick,) - elif nick != "up": + elif nick != "base": defkern = "kernel-%s" %(nick,) plainLabelUsed = 1 diff --git a/yuminstall.py b/yuminstall.py index 19758be96..7908b8e51 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -927,7 +927,7 @@ class YumBackend(AnacondaBackend): pattern = "" names = "" for (n, arch, tag) in kernelVersions: - if tag == "up": + if tag == "base": pkg = "kernel" else: pkg = "kernel-%s" %(tag,) @@ -944,7 +944,7 @@ class YumBackend(AnacondaBackend): os.system(command) for (n, arch, tag) in kernelVersions: - if tag == "up": + if tag == "base": pkg = "kernel" else: pkg = "kernel-%s" %(tag,) @@ -1356,7 +1356,7 @@ class YumBackend(AnacondaBackend): for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel'): version = ( tsmbr.version + '-' + tsmbr.release) - kernelVersions.append((version, tsmbr.arch, 'up')) + kernelVersions.append((version, tsmbr.arch, 'base')) return kernelVersions |