diff --git a/cloud-init-0.7.2-rsyslog-programname.patch b/cloud-init-0.7.2-rsyslog-programname.patch new file mode 100644 index 0000000..ddc0206 --- /dev/null +++ b/cloud-init-0.7.2-rsyslog-programname.patch @@ -0,0 +1,11 @@ +Index: cloud-init-0.7.2/tools/21-cloudinit.conf +=================================================================== +--- cloud-init-0.7.2.orig/tools/21-cloudinit.conf ++++ cloud-init-0.7.2/tools/21-cloudinit.conf +@@ -1,5 +1,5 @@ + # Log cloudinit generated log messages to file +-:syslogtag, isequal, "[CLOUDINIT]" /var/log/cloud-init.log ++:programname, isequal, "cloud-init" /var/log/cloud-init.log + + # comment out the following line to allow CLOUDINIT messages through. + # Doing so means you'll also get CLOUDINIT messages in /var/log/syslog diff --git a/cloud-init.spec b/cloud-init.spec index 9107747..bf2ee64 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -32,6 +32,9 @@ Patch2: cloud-init-0.7.2-nodevconsole.patch # https://bugs.launchpad.net/bugs/1228441 Patch3: cloud-init-0.7.2-selinux-enabled.patch +# Fix rsyslog log filtering +# https://code.launchpad.net/~gholms/cloud-init/rsyslog-programname/+merge/186906 +Patch4: cloud-init-0.7.2-rsyslog-programname.patch BuildArch: noarch @@ -73,6 +76,7 @@ ssh keys and to let the user run various scripts. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp -p %{SOURCE2} README.fedora @@ -157,6 +161,7 @@ fi - Fixed puppet agent service name [RH:1008250] - Let systemd handle console output [RH:977952 LP:1228434] - Fixed restorecon failure when selinux is disabled [RH:967002 LP:1228441] +- Fixed rsyslog log filtering * Sat Aug 03 2013 Fedora Release Engineering - 0.7.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild