generic/fedora-18-x86_64-cloud.ks generic/fedora-18-x86_64.ks generic/fedora-18-x86_64-minimal.ks

[Matthew Miller]

 generic/fedora-18-x86_64-cloud.ks   |   10 ++++++----
 generic/fedora-18-x86_64-minimal.ks |    3 ++-
 generic/fedora-18-x86_64.ks         |    4 +---
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 6cce6706c8a479be891b415b2e76574244a50ad7
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Fri Dec 14 14:29:54 2012 -0500

    Reduce list of firewalld deps cleaned from minimal; remove that cleaning from other kickstarts entirely.
    
    The new pygobject3-base addresses the excessive dependencies problem of
    firewalld (e.g., no more X11 or Wayland in minimal). Reduce the list of
    clean-up in the ultra-minimal kickstart, and completely remove the fragile
    and error-prone list from the other kickstarts (since having a few extra
    things like ebtables and libselinux-python seems a lesser evil).

diff --git a/generic/fedora-18-x86_64-cloud.ks b/generic/fedora-18-x86_64-cloud.ks
index cd8b30a..86ff68e 100644
--- a/generic/fedora-18-x86_64-cloud.ks
+++ b/generic/fedora-18-x86_64-cloud.ks
@@ -105,11 +105,8 @@ yum -C -y remove linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18, but is required to
 # be present for install/image building.
-echo "Removing firewalld and dependencies"
+echo "Removing firewalld."
 yum -C -y remove firewalld
-# These are all pulled in by firewalld (libselinux-python is too, but
-# is also required by cloud-init).
-yum -C -y remove cairo dbus-glib dbus-python ebtables fontconfig fontpackages-filesystem gobject-introspection js libdrm libpciaccess libpng libwayland-client libwayland-server libX11 libX11-common libXau libxcb libXdamage libXext libXfixes libXrender libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pixman polkit pycairo pygobject2 pygobject3 python-decorator python-slip python-slip-dbus
 
 # Non-firewalld-firewall
 echo -n "Writing static firewall"
@@ -139,6 +136,11 @@ echo .
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 
+# this is a kludge for an unexpected change in cloud-init. New
+# fedora package coming soon will make this unnecessary.
+sed -i '/system_info:/ a\  default_user: ec2-user' /etc/cloud/cloud.cfg
+
+
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
diff --git a/generic/fedora-18-x86_64-minimal.ks b/generic/fedora-18-x86_64-minimal.ks
index d317b7e..044335d 100644
--- a/generic/fedora-18-x86_64-minimal.ks
+++ b/generic/fedora-18-x86_64-minimal.ks
@@ -31,6 +31,7 @@ part / --size 1024 --fstype ext4 --ondisk sda
 
 # Repositories
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-18&arch=$basearch
+#repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f18&arch=$basearch
 
 
 # Packag list.
@@ -112,7 +113,7 @@ yum -C -y remove linux-firmware
 echo "Removing firewalld and dependencies"
 yum -C -y remove firewalld
 # These are all pulled in by firewalld
-yum -C -y remove cairo dbus-glib dbus-python ebtables fontconfig fontpackages-filesystem gobject-introspection js libdrm libpciaccess libpng libselinux-python libwayland-client libwayland-server libX11 libX11-common libXau libxcb libXdamage libXext libXfixes libXrender libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pixman polkit pycairo pygobject2 pygobject3 python-decorator python-slip python-slip-dbus
+yum -C -y remove cairo dbus-glib dbus-python ebtables gobject-introspection libselinux-python pygobject3-base python-slip python-slip-dbus
 
 # Non-firewalld-firewall
 echo -n "Writing static firewall"
diff --git a/generic/fedora-18-x86_64.ks b/generic/fedora-18-x86_64.ks
index a49ad26..8df5184 100644
--- a/generic/fedora-18-x86_64.ks
+++ b/generic/fedora-18-x86_64.ks
@@ -99,10 +99,8 @@ yum -C -y remove linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18, but is required to
 # be present for install/image building.
-echo "Removing firewalld and dependencies"
+echo "Removing firewalld."
 yum -C -y remove firewalld
-# These are all pulled in by firewalld
-yum -C -y remove cairo dbus-glib dbus-python ebtables fontconfig fontpackages-filesystem gobject-introspection js libdrm libpciaccess libpng libselinux-python libwayland-client libwayland-server libX11 libX11-common libXau libxcb libXdamage libXext libXfixes libXrender libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pixman polkit pycairo pygobject2 pygobject3 python-decorator python-slip python-slip-dbus
 
 # Non-firewalld-firewall
 echo -n "Writing static firewall"