diff options
| author | Robert Schweikert <rjschwei@suse.com> | 2018-09-17 13:07:39 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2018-09-17 13:07:39 +0000 |
| commit | c714651c1988a17f457426de63cdb8514d5a81b4 (patch) | |
| tree | 82b58290dec7210423c4f9c62b48fe4542faf781 /cloudinit | |
| parent | 37078046cb191234982d95ad4876af4ed8f862f4 (diff) | |
| download | vyos-cloud-init-c714651c1988a17f457426de63cdb8514d5a81b4.tar.gz vyos-cloud-init-c714651c1988a17f457426de63cdb8514d5a81b4.zip | |
Fall back to root:root on syslog permissions if other options fail.
If the user has removed the default configuration file or does
not set the syslog_fix_perms config option the user still ends
up with a warning on SUSE distributions. Add root:root to the
default builtin config.
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/cmd/tests/test_main.py | 4 | ||||
| -rw-r--r-- | cloudinit/settings.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/cmd/tests/test_main.py b/cloudinit/cmd/tests/test_main.py index e2c54ae8..a1e534fb 100644 --- a/cloudinit/cmd/tests/test_main.py +++ b/cloudinit/cmd/tests/test_main.py @@ -125,7 +125,9 @@ class TestMain(FilesystemMockingTestCase): updated_cfg.update( {'def_log_file': '/var/log/cloud-init.log', 'log_cfgs': [], - 'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel'], + 'syslog_fix_perms': [ + 'syslog:adm', 'root:adm', 'root:wheel', 'root:root' + ], 'vendor_data': {'enabled': True, 'prefix': []}}) updated_cfg.pop('system_info') diff --git a/cloudinit/settings.py b/cloudinit/settings.py index ea367cb7..b1ebaade 100644 --- a/cloudinit/settings.py +++ b/cloudinit/settings.py @@ -44,7 +44,7 @@ CFG_BUILTIN = { ], 'def_log_file': '/var/log/cloud-init.log', 'log_cfgs': [], - 'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel'], + 'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel', 'root:root'], 'system_info': { 'paths': { 'cloud_dir': '/var/lib/cloud', |