diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | instdata.py | 4 | ||||
| -rw-r--r-- | users.py | 47 |
3 files changed, 5 insertions, 51 deletions
@@ -1,3 +1,8 @@ +2006-03-30 Chris Lumens <clumens@redhat.com> + + * instdata.py (InstallData): Don't use Accounts anymore. + * users.py (Accounts): Removed. + 2006-03-28 Chris Lumens <clumens@redhat.com> * anaconda.spec: Bump version. diff --git a/instdata.py b/instdata.py index 33aad350a..6645f4665 100644 --- a/instdata.py +++ b/instdata.py @@ -57,7 +57,6 @@ class InstallData: self.firewall = firewall.Firewall() self.security = security.Security() self.timezone = timezone.Timezone() - self.accounts = users.Accounts() self.rootPassword = users.RootPassword () self.auth = "--enableshadow --enablemd5" self.desktop = desktop.Desktop() @@ -147,7 +146,6 @@ class InstallData: self.firewall.write (instPath) self.security.write (instPath) self.rootPassword.write (instPath, useMD5) - self.accounts.write (instPath, useMD5) def writeKS(self, filename): if self.auth.find("--enablemd5"): @@ -212,8 +210,6 @@ class InstallData: if self.backend is not None: self.backend.writePackagesKS(f) - f.write("\n%post\n") - self.accounts.writeKScommands(f, useMD5) # make it so only root can read, could have password os.chmod(filename, 0600) @@ -19,53 +19,6 @@ import random import crypt import os import string -from flags import flags - -import logging -log = logging.getLogger("anaconda") - -class Accounts: - def __repr__(self): - return "<Type Accounts>" - - def __str__(self): - return "<Type Accounts>" - - # List of (accountName, fullName, password) tupes - def setUserList(self, users): - self.users = users - - def getUserList(self): - return self.users - - def writeKScommands(self, f, useMD5): - for (account, name, password) in self.users: - crypted = cryptPassword(password, useMD5) - - f.write("/usr/sbin/useradd %s\n" % (account)); - f.write("chfn -f '%s' %s\n" % (name, account)) - f.write("/usr/sbin/usermod -p '%s' %s\n" % (crypted, account)) - f.write("\n") - - def write(self, instPath, useMD5): - if not self.users: return - - if not flags.setupFilesystems: - return - - for (account, name, password) in self.users: - argv = [ "/usr/sbin/useradd", account ] - iutil.execWithRedirect(argv[0], argv, root = instPath, - stdout = None) - - argv = [ "/usr/bin/chfn", "-f", name, account] - iutil.execWithRedirect(argv[0], argv, root = instPath, - stdout = None) - - setPassword(instPath, account, password, useMD5) - - def __init__(self): - self.users = [] class Password: def __init__ (self): |