diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-09-05 16:34:24 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-09-05 16:34:24 +0000 |
| commit | 5deccaced77a7ef64e161fab9415157d8919b15f (patch) | |
| tree | 1fecd9d666adabe8e9390a0fcde99639ec58b70a /kickstart.py | |
| parent | a78c9e098fe9001af3ddff99cc46a3f2112dd881 (diff) | |
| download | anaconda-5deccaced77a7ef64e161fab9415157d8919b15f.tar.gz anaconda-5deccaced77a7ef64e161fab9415157d8919b15f.tar.xz anaconda-5deccaced77a7ef64e161fab9415157d8919b15f.zip | |
merge anaconda-8-0-branch to HEAD
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/kickstart.py b/kickstart.py index cd8620007..c3411a5fd 100644 --- a/kickstart.py +++ b/kickstart.py @@ -279,8 +279,9 @@ class KickstartBase(BaseInstallClass): if upgrade: id.bootloader.kickstart = 1 id.bootloader.doUpgradeOnly = 1 - else: - self.showSteps.append("bootloadersetup") + + + self.showSteps.append("bootloadersetup") self.setBootloader(id, useLilo, location, linear, forceLBA, password, md5pass, appendLine) @@ -444,8 +445,21 @@ class KickstartBase(BaseInstallClass): def doLangSupport (self, id, args): (args, extra) = isys.getopt(args, '', [ 'default=' ]) + deflang = "en_US" if args: - self.setLanguageDefault (id, args[0][1]) + deflang = args[0][1] + else: + # if they specified no default we default to en_US if + # they installed support for more than one lang, otherwise + # we default to the one language they specified support for + if extra is None: + deflang = "en_US" + elif len(extra) >= 1: + deflang = extra[0] + else: + deflang = "en_US" + + self.setLanguageDefault (id, deflang) self.setLanguageSupport(id, extra) self.skipSteps.append("languagesupport") @@ -996,7 +1010,7 @@ class KickstartBase(BaseInstallClass): if grow: request.grow = 1 if maxSize: - request.maxSize = maxSize + request.maxSizeMB = maxSize if disk: request.drive = [ disk ] if primOnly: |