summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-10-02 17:52:57 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-10-02 17:52:57 -0400
commitf9ddb0752bfb6d604701f2fb24d873b95abe1973 (patch)
tree547021165e8965d631318c011aa5c4f8063a4d0f
parent29f1bd4746c78d342649d08afc6983e8da05d4a1 (diff)
downloadcobbler-f9ddb0752bfb6d604701f2fb24d873b95abe1973.tar.gz
cobbler-f9ddb0752bfb6d604701f2fb24d873b95abe1973.tar.xz
cobbler-f9ddb0752bfb6d604701f2fb24d873b95abe1973.zip
Fix, be sure to load settings in config
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/config.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a9f8f497..aec210f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ Cobbler CHANGELOG
- (FEAT) "template_universe" variable created for snake's usage, variable contains all template variables and is also passed to the template.
- (FEAT) refactored import with better Debian/Ubuntu support
- (FEAT) Func integration snippets and new settings
+- (FEAT) settings file and modules.conf now generated by setup.py using templates
- Fri Sep 26 2008 - 1.2.5
- (BUGF) expose --arch for "cobbler image add"
diff --git a/cobbler/config.py b/cobbler/config.py
index 11af497b..bbc78b42 100644
--- a/cobbler/config.py
+++ b/cobbler/config.py
@@ -181,6 +181,7 @@ class Config:
"""
Load the object hierachy from disk, using the filenames referenced in each object.
"""
+ serializer.deserialize(self._settings)
serializer.deserialize(self._distros)
serializer.deserialize(self._repos)
serializer.deserialize(self._profiles)