diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-01-27 10:27:54 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-01-27 10:27:54 -0500 |
| commit | fdc7a9c7bd4fe47ab1ac93971d9d40f064938462 (patch) | |
| tree | ba53a7c71db64ebfef3a7a7d6338193aafe8380b /cloudinit/__init__.py | |
| parent | 6ea51dcea03e72a444c2d706778832dcece69e80 (diff) | |
| download | vyos-cloud-init-fdc7a9c7bd4fe47ab1ac93971d9d40f064938462.tar.gz vyos-cloud-init-fdc7a9c7bd4fe47ab1ac93971d9d40f064938462.zip | |
take correct action if def_log_file and syslog_fix_perms are empty
Diffstat (limited to 'cloudinit/__init__.py')
| -rw-r--r-- | cloudinit/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index acedf77e..cbdf2271 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -482,13 +482,12 @@ def initfs(): util.ensure_dirs(dlist) cfg = util.get_base_cfg(system_config,cfg_builtin,parsed_cfgs) - log_file = None - if 'def_log_file' in cfg: - log_file = cfg['def_log_file'] + log_file = util.get_cfg_option_str(cfg, 'def_log_file', None) + perms = util.get_cfg_option_str(cfg, 'syslog_fix_perms', None) + if log_file: fp = open(log_file,"ab") fp.close() - if log_file and 'syslog_fix_perms' in cfg: - perms = cfg['syslog_fix_perms'] + if log_file and perms: (u,g) = perms.split(':',1) if u == "-1" or u == "None": u = None if g == "-1" or g == "None": g = None |