From ce5c59c29c459daeaf9f792f2a80604af7e654ff Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Sat, 15 Jun 2013 13:04:19 -0400
Subject: [PATCH] switch ec2-user to "fedora" --  see bugzilla #971439.

To use another name, use #cloud-config option "users:" in userdata in cloud
metadata service.

Also, add that user to systemd-journal group
---
 cloud-init-fedora.cfg | 6 +++---
 cloud-init.spec       | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cloud-init-fedora.cfg b/cloud-init-fedora.cfg
index ca5b613..65446f5 100644
--- a/cloud-init-fedora.cfg
+++ b/cloud-init-fedora.cfg
@@ -47,10 +47,10 @@ cloud_final_modules:
 
 system_info:
   default_user:
-    name: ec2-user
+    name: fedora
     lock_passwd: true
-    gecos: EC2 user
-    groups: [wheel, adm]
+    gecos: Fedora Cloud User
+    groups: [wheel, adm, systemd-journal]
     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
     shell: /bin/bash
   distro: fedora
diff --git a/cloud-init.spec b/cloud-init.spec
index b60586f..1f203f4 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
 
 Name:           cloud-init
 Version:        0.7.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -129,6 +129,12 @@ fi
 
 
 %changelog
+* Sat Jun 15 2013 Matthew Miller <mattdm@fedoraproject.org> - 0.7.2-3
+- switch ec2-user to "fedora" --  see bugzilla #971439. To use another
+  name, use #cloud-config option "users:" in userdata in cloud metadata
+  service
+- add that user to systemd-journal group
+
 * Fri May 17 2013 Steven Hardy <shardy@redhat.com> - 0.7.2
 - Update to the 0.7.2 release