diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-04-22 16:27:13 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-04-22 16:27:13 +0000 |
| commit | dcc913781c1d7c921b0d06987bcbded4230c3e79 (patch) | |
| tree | e39a6a3fdc7ef61e00eac457ec6c54a43482c377 /kickstart.py | |
| parent | 2627017d67c307ba4b05c66d412d052bfef5437a (diff) | |
| download | anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.tar.gz anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.tar.xz anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.zip | |
merge bootloader changes from HEAD
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kickstart.py b/kickstart.py index 012bf90b9..a4395ef46 100644 --- a/kickstart.py +++ b/kickstart.py @@ -260,7 +260,6 @@ class KickstartBase(BaseInstallClass): else: location = validLocations.index(location) - # FIXME: upgrade mode not implemented yet on HEAD if upgrade and not id.upgrade.get(): raise RuntimeError, "Selected upgrade mode for bootloader but not doing an upgrade" @@ -270,8 +269,7 @@ class KickstartBase(BaseInstallClass): self.setBootloader(id, useLilo, location, linear, forceLBA, password, md5pass, appendLine) - # FIXME: uncomment when upgrade boot loader stuff is merged -# self.skipSteps.append("upgbootloader") + self.skipSteps.append("upgbootloader") self.skipSteps.append("bootloader") self.skipSteps.append("bootloaderadvanced") |