diff --git a/0001-Set-syslog_fix_perms-for-SUSE-distro-addresses-bsc-1.patch b/0001-Set-syslog_fix_perms-for-SUSE-distro-addresses-bsc-1.patch new file mode 100644 index 0000000..52f12c0 --- /dev/null +++ b/0001-Set-syslog_fix_perms-for-SUSE-distro-addresses-bsc-1.patch @@ -0,0 +1,28 @@ +From 28167e24ae4a0e744103a71061474836dc6a9559 Mon Sep 17 00:00:00 2001 +From: Robert Schweikert +Date: Tue, 13 Feb 2018 14:28:51 -0500 +Subject: [PATCH] - Set syslog_fix_perms for SUSE distro, addresses bsc#1080595 + + Avoid using the default configuration for syslog ownership the neither + "adm" nor "wheel" groups are part of the default config on SUSE distros + +--- + config/cloud.cfg.tmpl | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl +index 32de9c9b..3ab681ee 100644 +--- a/config/cloud.cfg.tmpl ++++ b/config/cloud.cfg.tmpl +@@ -5,6 +5,9 @@ + {% if variant in ["freebsd"] %} + syslog_fix_perms: root:wheel + {% endif %} ++{% if variant in ["suse"] %} ++syslog_fix_perms: root:adm ++{% endif %} + # A set of users which may be applied and/or used by various modules + # when a 'default' entry is found it will reference the 'default_user' + # from the distro configuration specified below +-- +2.13.6 + diff --git a/cloud-init.changes b/cloud-init.changes index 31b1655..eb9cace 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 13 19:39:50 UTC 2018 - rjschwei@suse.com + +- Fix logfile permission settings (bsc#1080595) + + Add 0001-Set-syslog_fix_perms-for-SUSE-distro-addresses-bsc-1.patch + ------------------------------------------------------------------- Tue Jan 30 13:20:57 UTC 2018 - dmueller@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index fa736d1..2fa6f1d 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -55,6 +55,9 @@ Patch40: 0001-switch-to-using-iproute2-tools.patch Patch41: cloud-init-no-python-linux-dist.patch # Disable OVF tests Patch42: cloud-init-skip-ovf-tests.patch +# FIXME do not use the default user:groups for log file permission settings +# Proposed for merging upstream +Patch43: 0001-Set-syslog_fix_perms-for-SUSE-distro-addresses-bsc-1.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir @@ -200,6 +203,7 @@ Documentation and examples for cloud-init tools %patch40 -p1 %patch41 %patch42 +%patch43 -p1 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315