[spin-kickstarts/f20] switch order of serial and virtual console so logs output to serial console because that's more usef
by Adam Williamson
commit 5579ccc249d243a3be91188d8dc95ea482e33956
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Dec 10 15:58:02 2013 -0500
switch order of serial and virtual console so logs output to serial console
because that's more useful in openstack. Note does not affect pvgrub
(and therefore ec2)
fedora-cloud-base.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 3f2aa33..66109af 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -21,7 +21,7 @@ rootpw --lock --iscrypted locked
firewall --disabled
-bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
10 years, 4 months
[spin-kickstarts] switch order of serial and virtual console so logs output to serial console because that's more usef
by Matthew Miller
commit 91a9117bc488ce65444a786b8561589d795bc8d1
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Dec 10 15:58:02 2013 -0500
switch order of serial and virtual console so logs output to serial console
because that's more useful in openstack. Note does not affect pvgrub
(and therefore ec2)
fedora-cloud-base.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 5e847e2..756b097 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -21,7 +21,7 @@ rootpw --lock --iscrypted locked
firewall --disabled
-bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
10 years, 4 months
[spin-kickstarts] set releasever and basearch so we can find the right RPM GPG key to import
by Matthew Miller
commit 07ed9c93b228acb4ca564db2203646db10c06cc4
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Tue Dec 10 15:09:10 2013 -0500
set releasever and basearch so we can find the right RPM GPG key to import
fedora-live-base.ks | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index a87bc62..35099d3 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -280,6 +280,8 @@ systemctl enable tmp.mount
# work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -m)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
echo "Packages within this LiveCD"
rpm -qa
10 years, 4 months
[spin-kickstarts] remove desktops from server
by Dennis Gilmore
commit 8f0370b13f4e283fb08d51eaf4c681de89f0ee5b
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Dec 9 19:43:42 2013 -0600
remove desktops from server
fedora-install-server.ks | 52 +---------------------------------------------
1 files changed, 1 insertions(+), 51 deletions(-)
---
diff --git a/fedora-install-server.ks b/fedora-install-server.ks
index c45a578..fef1c0d 100644
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -53,56 +53,15 @@ dracut-*
## common stuff
@base-x
-@guest-desktop-agents
@guest-agents
@standard
@core
-@dial-up
-@fonts
@input-methods
@multimedia
@hardware-support
-@printing
@admin-tools
@basic-desktop
-## GNOME
-@firefox
-@gnome-desktop
-@epiphany
-@libreoffice
-@gnome-games
-
-## KDE
-@kde-desktop
-@kde-apps
-@kde-education
-@kde-media
-@kde-office
-
-## XFCE
-@xfce-desktop
-@xfce-apps
-@xfce-extra-plugins
-@xfce-media
-@xfce-office
-
-## LXDE
-@lxde-desktop
-@lxde-apps
-@lxde-media
-@lxde-office
-
-## SUGAR
-@sugar-desktop
-@sugar-apps
-
-## MATE
-@mate-desktop
-
-## CINNAMON
-@cinnamon-desktop
-
# Workstation
@eclipse
@development-libs
@@ -110,9 +69,6 @@ dracut-*
@c-development
@rpm-development-tools
@fedora-packager
-@gnome-software-development
-@kde-software-development
-@x-software-development
@virtualization
@web-server
@mongodb
@@ -123,13 +79,7 @@ dracut-*
@mysql
@sql-server
@design-suite
-## Not included yet due to space concerns
-#@jbossas
-#@milkymist
-#@mingw32
-#@ocaml
-#@robotics-suite
-#@electronic-lab
+@jbossas
# Things needed for installation
@anaconda-tools
10 years, 4 months
[spin-kickstarts] remove desktops and development from cloud installer
by Dennis Gilmore
commit 41845d3dc412b13df9b1df8b898062fa9d4894dc
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Dec 9 19:41:28 2013 -0600
remove desktops and development from cloud installer
fedora-install-cloud.ks | 57 +---------------------------------------------
1 files changed, 2 insertions(+), 55 deletions(-)
---
diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index c45a578..ee751f3 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -66,53 +66,7 @@ dracut-*
@admin-tools
@basic-desktop
-## GNOME
-@firefox
-@gnome-desktop
-@epiphany
-@libreoffice
-@gnome-games
-
-## KDE
-@kde-desktop
-@kde-apps
-@kde-education
-@kde-media
-@kde-office
-
-## XFCE
-@xfce-desktop
-@xfce-apps
-@xfce-extra-plugins
-@xfce-media
-@xfce-office
-
-## LXDE
-@lxde-desktop
-@lxde-apps
-@lxde-media
-@lxde-office
-
-## SUGAR
-@sugar-desktop
-@sugar-apps
-
-## MATE
-@mate-desktop
-
-## CINNAMON
-@cinnamon-desktop
-
-# Workstation
-@eclipse
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-@gnome-software-development
-@kde-software-development
-@x-software-development
+
@virtualization
@web-server
@mongodb
@@ -122,14 +76,7 @@ dracut-*
@rubyonrails
@mysql
@sql-server
-@design-suite
-## Not included yet due to space concerns
-#@jbossas
-#@milkymist
-#@mingw32
-#@ocaml
-#@robotics-suite
-#@electronic-lab
+@jbossas
# Things needed for installation
@anaconda-tools
10 years, 4 months
[spin-kickstarts] setup kickstarts for each product, copies of fedora-install-fedora.ks
by Dennis Gilmore
commit 70e458097725bacddc332e2c64f43652e7ad899b
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Dec 9 19:38:19 2013 -0600
setup kickstarts for each product, copies of fedora-install-fedora.ks
...ra-install-fedora.ks => fedora-install-cloud.ks | 0
...a-install-fedora.ks => fedora-install-server.ks | 0
...tall-fedora.ks => fedora-install-workstation.ks | 0
3 files changed, 0 insertions(+), 0 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-cloud.ks
similarity index 100%
copy from fedora-install-fedora.ks
copy to fedora-install-cloud.ks
diff --git a/fedora-install-fedora.ks b/fedora-install-server.ks
similarity index 100%
copy from fedora-install-fedora.ks
copy to fedora-install-server.ks
diff --git a/fedora-install-fedora.ks b/fedora-install-workstation.ks
similarity index 100%
rename from fedora-install-fedora.ks
rename to fedora-install-workstation.ks
10 years, 4 months
[spin-kickstarts/f20] by popular demand, disable the iptables firewall entirely.
by Matthew Miller
commit ba05c3ed084541dfbd0e2efc80ba4817df55c8f2
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Mon Nov 18 12:15:19 2013 -0500
by popular demand, disable the iptables firewall entirely.
(cherry picked from commit fe5b6843ac682b85726bd9da4af5fe9f00d7e074)
fedora-cloud-base.ks | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 15e6b70..21b6473 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -19,14 +19,12 @@ auth --useshadow --enablemd5
selinux --enforcing
rootpw --lock --iscrypted locked
-# this is actually not used, but a static firewall
-# matching these rules is generated below.
-firewall --service=ssh
+firewall --disabled
bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
zerombr
@@ -63,10 +61,6 @@ syslinux-extlinux
# 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
tar
rsync
@@ -135,28 +129,6 @@ yum -C -y remove linux-firmware
echo "Removing firewalld."
yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-# 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 .
-
# Another one needed at install time but not after that, and it pulls
# in some unneeded deps (like, newt and slang)
echo "Removing authconfig."
10 years, 4 months
[spin-kickstarts/f20] cloud image import fedora GPG key for RPMs, as the livecd does
by Matthew Miller
commit d7613606686f853b04f7d5e5a150a5ddf6451a20
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Fri Dec 6 12:16:02 2013 -0500
cloud image import fedora GPG key for RPMs, as the livecd does
(cherry picked from commit c6f36e4c103de8a5be3ddc54efc3bfed0e85ac88)
fedora-cloud-base.ks | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 5461bda..3f2aa33 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -195,6 +195,19 @@ yum history new
yum clean all
truncate -c -s 0 /var/log/yum.log
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -m)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+
echo "Fixing SELinux contexts."
touch /var/log/cron
touch /var/log/boot.log
10 years, 4 months
[spin-kickstarts/f20] selinux context fixes for cloud image
by Matthew Miller
commit 9625f87b664d91a9972802e493103d6f62e506fb
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Dec 4 09:50:21 2013 -0500
selinux context fixes for cloud image
(cherry picked from commit 77ea37a42473764bdc58cfdd072fbcffd8d8ba9f)
fedora-cloud-base.ks | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 21b6473..5461bda 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -196,7 +196,12 @@ yum clean all
truncate -c -s 0 /var/log/yum.log
echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys
echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files
10 years, 4 months