diff options
Diffstat (limited to 'cobbler/settings.py')
| -rw-r--r-- | cobbler/settings.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cobbler/settings.py b/cobbler/settings.py index af62766..d7fcd8c 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -24,7 +24,14 @@ DEFAULTS = { "server" : "127.0.0.1", "next_server" : "127.0.0.1", "dhcpd_bin" : "/usr/sbin/dhcpd", - "kernel_options" : "append devfs=nomount ramdisk_size=16438 lang= text ksdevice=eth0", + "kernel_options" : { + "append" : None, + "devfs" : "nomount", + "ramdisk_size" : 16438, + "lang=" : " ", + "text" : None, + "ksdevice" : "eth0", + }, "tftpd_conf" : "/etc/xinetd.d/tftp", "tftpboot" : "/tftpboot", "webdir" : "/var/www/cobbler", @@ -87,6 +94,11 @@ class Settings(serializable.Serializable): def __getattr__(self,name): if self._attributes.has_key(name): + if name == "kernel_options": + # backwards compatibility -- convert possible string value to hash + (success, result) = utils.input_string_or_hash(self._attributes[name], " ") + self._attributes[name] = result + return result return self._attributes[name] elif DEFAULTS.has_key(name): lookup = DEFAULTS[name] |