diff options
author | Chris Lumens <clumens@redhat.com> | 2006-01-17 16:41:56 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2006-01-17 16:41:56 +0000 |
commit | 1b08c711e7eaaecb3afc22f0a02a859d6fc1b51d (patch) | |
tree | e2079ebebbf202a72f994ad7f5df1b49a7194826 /instdata.py | |
parent | 7c16942854c277955deeed50ebfd2235f2a456ab (diff) | |
download | anaconda-1b08c711e7eaaecb3afc22f0a02a859d6fc1b51d.tar.gz anaconda-1b08c711e7eaaecb3afc22f0a02a859d6fc1b51d.tar.xz anaconda-1b08c711e7eaaecb3afc22f0a02a859d6fc1b51d.zip |
Don't traceback on printing out an authconfig-related error message (#178041).
Diffstat (limited to 'instdata.py')
-rw-r--r-- | instdata.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/instdata.py b/instdata.py index dc233f68d..67703e132 100644 --- a/instdata.py +++ b/instdata.py @@ -123,24 +123,24 @@ class InstallData: self.timezone.write (instPath) + args = ["/usr/bin/authconfig", "--update", "--nostart"] + self.auth.split() + try: if flags.setupFilesystems: - args = ["/usr/bin/authconfig", "--update", "--nostart"] + self.auth.split() iutil.execWithRedirect("/usr/bin/authconfig", args, stdout = None, stderr = None, searchPath = 1, root = instPath) else: - log.error("Would have run: /usr/bin/authconfig %s", args) + log.error("Would have run: %s", args) except RuntimeError, msg: - log.error("Error running /usr/bin/authconfig %s: %s", - args, msg) + log.error("Error running %s: %s", args, msg) self.firewall.write (instPath) self.security.write (instPath) self.rootPassword.write (instPath, useMD5) self.accounts.write (instPath, useMD5) - def writeKS(self, filename): + def writeKS(self, filename, backend): if self.auth.find("--enablemd5"): useMD5 = True else: @@ -201,8 +201,7 @@ class InstallData: self.timezone.writeKS(f) self.bootloader.writeKS(f) self.partitions.writeKS(f) -# FIXME: write package selection using backend - #self.backend.writePackagesKS(f) + backend.writePackagesKS(f) f.write("\n%post\n") self.accounts.writeKScommands(f, useMD5) |