summaryrefslogtreecommitdiffstats
path: root/cobbler/settings.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-03-26 16:02:48 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-03-26 16:02:48 -0400
commit602591cae12323012693f49de3ba59516b40c3f5 (patch)
treef24231c3cb9badc6809f57b5de1d2080688a5aac /cobbler/settings.py
parenta6a82750ac3cab01fbafdd689a7ea1f5f6dc0bf7 (diff)
downloadthird_party-cobbler-602591cae12323012693f49de3ba59516b40c3f5.tar.gz
third_party-cobbler-602591cae12323012693f49de3ba59516b40c3f5.tar.xz
third_party-cobbler-602591cae12323012693f49de3ba59516b40c3f5.zip
Add a --owner to all the objects, plus associated API calls and backend stuff, for use with the (pending real soon now)
authz_ownership module. Also updated docs. Incidentally, self.settings.tftpboot is now utils.tftpboot_location() -- which is required because tftpboot moves around. Previously this was masked to still look like a settings variable but I decided to remove the hack. All code using that location has been updated appropriately.
Diffstat (limited to 'cobbler/settings.py')
-rw-r--r--cobbler/settings.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 495a4b5..e3d8a46 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -58,7 +58,6 @@ DEFAULTS = {
"server" : "127.0.0.1",
"snippetsdir" : "/var/lib/cobbler/snippets",
"syslog_port" : 25150,
- "tftpboot" : -1, # special, see note below
"tftpd_bin" : "/usr/sbin/in.tftpd",
"tftpd_conf" : "/etc/xinetd.d/tftp",
"webdir" : "/var/www/cobbler",
@@ -109,11 +108,6 @@ class Settings(serializable.Serializable):
self._attributes = datastruct
- # this last attribute is special. In F9, the tftpboot location moves, so
- # what we have in settings is not (neccessarily) correct. So instead
- # of using settings we determine it by looking at the OS.
- self._attributes["tftpboot"] = utils.tftpboot_location()
-
return self
def __getattr__(self,name):