2 commits - ec2/fedora-19-i386-ec2.ks ec2/fedora-19-x86_64-ec2.ks generic/fedora-19-i386-cloud.ks generic/fedora-19-i386.ks generic/fedora-19-i386-minimal.ks generic/fedora-19-x86_64-cloud.ks generic/fedora-19-x86_64.ks generic/fedora-19-x86_64-minimal.ks

[Matthew Miller]

 ec2/fedora-19-i386-ec2.ks           |  168 ------------------------------------
 ec2/fedora-19-x86_64-ec2.ks         |  168 ------------------------------------
 generic/fedora-19-i386-cloud.ks     |    4 
 generic/fedora-19-i386-minimal.ks   |    4 
 generic/fedora-19-i386.ks           |    4 
 generic/fedora-19-x86_64-cloud.ks   |    4 
 generic/fedora-19-x86_64-minimal.ks |    4 
 generic/fedora-19-x86_64.ks         |    4 
 8 files changed, 26 insertions(+), 334 deletions(-)

New commits:
commit 8026cafc3374899831a4f5667abad585cb7924e5
Author: Matthew Miller <mattdm(a)mattdm.org&gt;
Date:   Tue May 14 11:11:44 2013 -0400

    note on appliance-creator for f19

diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index f34cbb6..04f6cf3 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -7,6 +7,10 @@
 #
 # Note that unlike the standard F19 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index 27c2e0a..17b4a3d 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -8,6 +8,10 @@
 # If you're interested in making this more minimal, big problems to solve
 # are the not-needed-for-cloud kernel modules and the gigantic locale
 # database. After that, it's chipping at dependencies.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index 80cf833..f55062e 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -2,6 +2,10 @@
 # private cloud environments. This flavor isn't configured with cloud-init
 # or any other metadata service; you'll need your own say of getting
 # user (or root) credentials on the system.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 4c6ad5b..debf7a0 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -7,6 +7,10 @@
 #
 # Note that unlike the standard F19 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index 92a8874..bc72589 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -8,6 +8,10 @@
 # If you're interested in making this more minimal, big problems to solve
 # are the not-needed-for-cloud kernel modules and the gigantic locale
 # database. After that, it's chipping at dependencies.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 02cb9b6..6f24ab7 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -2,6 +2,10 @@
 # private cloud environments. This flavor isn't configured with cloud-init
 # or any other metadata service; you'll need your own say of getting
 # user (or root) credentials on the system.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
 lang en_US.UTF-8
 keyboard us


commit 28398f59a3b9a2b133ba00b0ac359b87616b266a
Author: Matthew Miller <mattdm(a)mattdm.org&gt;
Date:   Mon May 13 13:11:30 2013 -0400

    Change the F19 ec2 kickstarts to be symlinks to the generic cloud
    kickstarts -- I think we've successfully excised the differences.

diff --git a/ec2/fedora-19-i386-ec2.ks b/ec2/fedora-19-i386-ec2.ks
deleted file mode 100644
index 928f342..0000000
--- a/ec2/fedora-19-i386-ec2.ks
+++ /dev/null
@@ -1,167 +0,0 @@
-# This is a basic Fedora 18 spin designed to work in Amazon EC2.
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. That also
-# currently creates an ec2-user account; we'll probably want to make that
-# something generic by default. The root password is empty by default.
-#
-# Note that unlike the standard F18 install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-
-auth --useshadow --enablemd5
-selinux --enforcing
-
-# this is actually not used, but a static firewall
-# matching these rules is generated below.
-firewall --service=ssh
-
-bootloader --timeout=0 --location=mbr --driveorder=sda
-
-network --bootproto=dhcp --device=eth0 --onboot=on
-services
--enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-# This would let fussy grub2 install, but will break in EC2
-#part biosboot --fstype=biosboot --size=1 --ondisk sda
-part / --size 10000 --fstype ext4 --ondisk sda
-
-# Repositories
-repo --name=fedora
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=$basearch
-
-
-# Package list.
-%packages --nobase
-@core
-kernel-PAE
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# Needed initially, but removed below.
-firewalld
-
-# Basic firewall. If you're going to rely on your cloud service's
-# security groups you can remove this.
-iptables-services
-
-# cherry-pick a few things from @standard
-tmpwatch
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--polkit
-
-%end
-
-
-
-%post --erroronfail
-
-echo -n "Writing fstab"
-cat <<EOF > /etc/fstab
-LABEL=_/   /         ext4    defaults        1 1
-EOF
-echo .
-
-# workaround xen performance issue (bz 651861)
-echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-
-echo -n "Grub tweaks"
-echo GRUB_TIMEOUT=0 > /etc/default/grub
-sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this
image' /boot/grub/grub.conf
-sed -i 's/^timeout=5/timeout=0/' /boot/grub/grub.conf
-sed -i 's/^default=1/default=0/' /boot/grub/grub.conf
-sed -i '/splashimage/d' /boot/grub/grub.conf
-# need to file a bug on this one
-sed -i 's/root=.*/root=LABEL=_\//' /boot/grub/grub.conf
-echo .
-if ! [[ -e /boot/grub/menu.lst ]]; then
-  echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-  ln /boot/grub/grub.conf /boot/grub/menu.lst
-  ln -sf /boot/grub/grub.conf /etc/grub.conf
-fi
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/ 
-#echo .
-
-# this is installed by default but we don't need it in virt
-echo "Removing linux-firmware package."
-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."
-yum -C -y remove firewalld
-
-# Non-firewalld-firewall
-echo -n "Writing static firewall"
-cat <<EOF > /etc/sysconfig/iptables
-# Simple static firewall loaded by iptables.service. Replace
-# this with your own custom rules, run lokkit, or switch to 
-# shorewall or firewalld as your needs dictate.
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
--A INPUT -p icmp -j ACCEPT
--A INPUT -i lo -j ACCEPT
--A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
--A INPUT -j REJECT --reject-with icmp-host-prohibited
--A FORWARD -j REJECT --reject-with icmp-host-prohibited
-COMMIT
-EOF
-echo .
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# appliance-creator does not make this important file.
-if [ ! -e /etc/sysconfig/kernel ]; then
-echo "Creating /etc/sysconfig/kernel."
-cat <<EOF > /etc/sysconfig/kernel
-# UPDATEDEFAULT specifies if new-kernel-pkg should make
-# new kernels the default
-UPDATEDEFAULT=yes
-
-# DEFAULTKERNEL specifies the default kernel package type
-DEFAULTKERNEL=kernel-PAE
-EOF
-fi 
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-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 || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
diff --git a/ec2/fedora-19-i386-ec2.ks b/ec2/fedora-19-i386-ec2.ks
new file mode 120000
index 0000000..0cfb56d
--- /dev/null
+++ b/ec2/fedora-19-i386-ec2.ks
@@ -0,0 +1 @@
+../generic/fedora-19-i386-cloud.ks
\ No newline at end of file
diff --git a/ec2/fedora-19-x86_64-ec2.ks b/ec2/fedora-19-x86_64-ec2.ks
deleted file mode 100644
index 3250fd4..0000000
--- a/ec2/fedora-19-x86_64-ec2.ks
+++ /dev/null
@@ -1,167 +0,0 @@
-# This is a basic Fedora 18 spin designed to work in Amazon EC2.
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. That also
-# currently creates an ec2-user account; we'll probably want to make that
-# something generic by default. The root password is empty by default.
-#
-# Note that unlike the standard F18 install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-
-auth --useshadow --enablemd5
-selinux --enforcing
-
-# this is actually not used, but a static firewall
-# matching these rules is generated below.
-firewall --service=ssh
-
-bootloader --timeout=0 --location=mbr --driveorder=sda
-
-network --bootproto=dhcp --device=eth0 --onboot=on
-services
--enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-# This would let fussy grub2 install, but will break in EC2
-#part biosboot --fstype=biosboot --size=1 --ondisk sda
-part / --size 10000 --fstype ext4 --ondisk sda
-
-# Repositories
-repo --name=fedora
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-18&arch=$basearch
-
-
-# Package list.
-%packages --nobase
-@core
-kernel
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# Needed initially, but removed below.
-firewalld
-
-# Basic firewall. If you're going to rely on your cloud service's
-# security groups you can remove this.
-iptables-services
-
-# cherry-pick a few things from @standard
-tmpwatch
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--polkit
-
-%end
-
-
-
-%post --erroronfail
-
-echo -n "Writing fstab"
-cat <<EOF > /etc/fstab
-LABEL=_/   /         ext4    defaults        1 1
-EOF
-echo .
-
-# workaround xen performance issue (bz 651861)
-echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf
-
-echo -n "Grub tweaks"
-echo GRUB_TIMEOUT=0 > /etc/default/grub
-sed -i '1i# This file is for use with pv-grub; legacy grub is not installed in this
image' /boot/grub/grub.conf
-sed -i 's/^timeout=5/timeout=0/' /boot/grub/grub.conf
-sed -i 's/^default=1/default=0/' /boot/grub/grub.conf
-sed -i '/splashimage/d' /boot/grub/grub.conf
-# need to file a bug on this one
-sed -i 's/root=.*/root=LABEL=_\//' /boot/grub/grub.conf
-echo .
-if ! [[ -e /boot/grub/menu.lst ]]; then
-  echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-  ln /boot/grub/grub.conf /boot/grub/menu.lst
-  ln -sf /boot/grub/grub.conf /etc/grub.conf
-fi
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/ 
-#echo .
-
-# this is installed by default but we don't need it in virt
-echo "Removing linux-firmware package."
-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."
-yum -C -y remove firewalld
-
-# Non-firewalld-firewall
-echo -n "Writing static firewall"
-cat <<EOF > /etc/sysconfig/iptables
-# Simple static firewall loaded by iptables.service. Replace
-# this with your own custom rules, run lokkit, or switch to 
-# shorewall or firewalld as your needs dictate.
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
--A INPUT -p icmp -j ACCEPT
--A INPUT -i lo -j ACCEPT
--A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
-#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
--A INPUT -j REJECT --reject-with icmp-host-prohibited
--A FORWARD -j REJECT --reject-with icmp-host-prohibited
-COMMIT
-EOF
-echo .
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# appliance-creator does not make this important file.
-if [ ! -e /etc/sysconfig/kernel ]; then
-echo "Creating /etc/sysconfig/kernel."
-cat <<EOF > /etc/sysconfig/kernel
-# UPDATEDEFAULT specifies if new-kernel-pkg should make
-# new kernels the default
-UPDATEDEFAULT=yes
-
-# DEFAULTKERNEL specifies the default kernel package type
-DEFAULTKERNEL=kernel
-EOF
-fi 
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-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 || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
diff --git a/ec2/fedora-19-x86_64-ec2.ks b/ec2/fedora-19-x86_64-ec2.ks
new file mode 120000
index 0000000..1e50c9a
--- /dev/null
+++ b/ec2/fedora-19-x86_64-ec2.ks
@@ -0,0 +1 @@
+../generic/fedora-19-x86_64-cloud.ks
\ No newline at end of file