From 4a34b62576528d714fd14d1ecaf7c6749f62df12 Mon Sep 17 00:00:00 2001
From: Matt Hicks <mhicks@localhost.localdomain>
Date: Fri, 18 Jul 2008 14:24:20 -0400
Subject: Adding the combo image

---
 genome-respin/genome-respin.spec        |   3 +-
 genome-respin/repo/conf.d/cloud-ks.cfg  |   2 -
 genome-respin/repo/conf.d/combo-ks.cfg  | 113 ++++++++++++++++++++++++++++++++
 genome-respin/repo/conf.d/genome-ks.cfg |   2 -
 genome-respin/repo/genome.conf          |  15 +++++
 5 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 genome-respin/repo/conf.d/combo-ks.cfg

diff --git a/genome-respin/genome-respin.spec b/genome-respin/genome-respin.spec
index 67733ea..6447f29 100644
--- a/genome-respin/genome-respin.spec
+++ b/genome-respin/genome-respin.spec
@@ -2,7 +2,7 @@ Summary: Genome Respins
 Name: genome-respin
 Source: genome-respin-bin.tar.gz
 Version: 1.0.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Group: Applications/System
@@ -41,6 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/revisor/genome.conf
 /etc/revisor/conf.d/genome-ks.cfg
 /etc/revisor/conf.d/cloud-ks.cfg
+/etc/revisor/conf.d/combo-ks.cfg
 /etc/revisor/conf.d/genome-f9-i386.conf
 
 %doc
diff --git a/genome-respin/repo/conf.d/cloud-ks.cfg b/genome-respin/repo/conf.d/cloud-ks.cfg
index bb7c3e7..2492662 100644
--- a/genome-respin/repo/conf.d/cloud-ks.cfg
+++ b/genome-respin/repo/conf.d/cloud-ks.cfg
@@ -9,8 +9,6 @@ text
 firewall --disabled
 # Run the Setup Agent on first boot
 firstboot --disable
-# Network Manager breaks networking on F8
-services --disabled=NetworkManager
 # System keyboard
 keyboard us
 # System language
diff --git a/genome-respin/repo/conf.d/combo-ks.cfg b/genome-respin/repo/conf.d/combo-ks.cfg
new file mode 100644
index 0000000..12a2958
--- /dev/null
+++ b/genome-respin/repo/conf.d/combo-ks.cfg
@@ -0,0 +1,113 @@
+#platform=x86, AMD64, or Intel EM64T
+# System authorization information
+auth  --useshadow  --enablemd5
+# System bootloader configuration
+bootloader --location=mbr
+# Use text install
+text
+# Firewall configuration
+firewall --disabled
+# Run the Setup Agent on first boot
+firstboot --disable
+# System keyboard
+keyboard us
+# System language
+lang en_US
+# Use CDROM installation media
+cdrom
+# Network information
+network --bootproto=dhcp --device=eth0 --onboot=on
+# Reboot after installation
+reboot --eject
+# Root password
+rootpw password
+
+# SELinux configuration
+selinux --disabled
+# Skip X Configuration
+skipx
+# System timezone
+timezone  America/New_York
+# Install OS instead of upgrade
+install
+
+# Clear the Master Boot Record
+zerombr
+# Setup LVM for the Cloud machines
+clearpart --all --initlabel
+partition /boot --fstype=ext3 --size=200
+partition pv.01 --size=51200
+partition pv.02 --size=10240 --grow
+volgroup HostVolGroup00 pv.01
+volgroup HostVolGroupImages pv.02
+logvol swap --fstype swap --name=Swap --vgname=HostVolGroup00 --size=2048
+logvol / --fstype ext3 --name=Root --vgname=HostVolGroup00 --size=51200 --grow
+logvol /images --fstype ext3 --name=Images --vgname=HostVolGroupImages --size=10240 --grow
+
+%packages
+kernel-PAE
+kvm
+bridge-utils
+vim-enhanced
+yum
+-yum-updatesd
+httpd-cloudmasterd
+rubygem-cloudmasterd
+genome-bridge
+genome-repo
+rubygem-genome-bootstrap
+
+%post
+# Identify this machine as a Combo respin
+/bin/touch /etc/sysconfig/cloud-respin
+/bin/touch /etc/sysconfig/genome-respin
+
+# Extend the number of loopback devices allowed
+echo "options loop max_loop=255" >> /etc/modules.conf
+
+# Set the certmaster in the minion configuration
+sed -i "s/certmaster = certmaster/certmaster = localhost/g" /etc/certmaster/minion.conf
+
+# Turn on autosigning
+sed -i "s/autosign = no/autosign = yes/g" /etc/certmaster/certmaster.conf
+
+# Chkconfig the cloudmasterd and httpd services
+/sbin/chkconfig --add cloudmasterd
+/sbin/chkconfig cloudmasterd on
+/sbin/chkconfig --add httpd
+/sbin/chkconfig httpd on
+
+/sbin/chkconfig NetworkManager off
+/sbin/chkconfig network on
+/sbin/chkconfig genome-bridge on
+
+# Chkconfig the bootstrap script
+/sbin/chkconfig --add genome-repo-bootstrap
+/sbin/chkconfig genome-repo-bootstrap on
+
+# Determine the operating system release and version
+if [ "`grep 'Red Hat' /etc/redhat-release`" != "" ]; then
+  export RELEASE="RHEL"
+elif [ "`grep 'CentOS' /etc/redhat-release`" != "" ]; then
+  export RELEASE="CentOS"
+else
+  export RELEASE="Fedora"
+fi
+
+echo """
+[genome-noarch]
+name=genome-noarch
+baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/$RELEASE-\$releasever-genome-noarch
+enabled=1
+priority=99
+gpgcheck=0
+
+[genome-\$basearch]
+name=genome-\$basearch
+baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/$RELEASE-\$releasever-genome-\$basearch
+enabled=1
+priority=99
+gpgcheck=0
+""" > /etc/yum.repos.d/genome.repo
+
+%end
diff --git a/genome-respin/repo/conf.d/genome-ks.cfg b/genome-respin/repo/conf.d/genome-ks.cfg
index 33352ec..ba16598 100644
--- a/genome-respin/repo/conf.d/genome-ks.cfg
+++ b/genome-respin/repo/conf.d/genome-ks.cfg
@@ -9,8 +9,6 @@ text
 firewall --disabled
 # Run the Setup Agent on first boot
 firstboot --disable
-# Network Manager breaks networking on F8
-services --disabled=NetworkManager
 # System keyboard
 keyboard us
 # System language
diff --git a/genome-respin/repo/genome.conf b/genome-respin/repo/genome.conf
index 0710fb9..9cf08dc 100644
--- a/genome-respin/repo/genome.conf
+++ b/genome-respin/repo/genome.conf
@@ -55,3 +55,18 @@ kickstart_default=1
 kickstart_file=/etc/revisor/conf.d/cloud-ks.cfg
 iso_label=Cloud-Fedora
 iso_basename=Cloud-Fedora
+
+[combo-f9-i386]
+main = /etc/revisor/conf.d/genome-f9-i386.conf
+product_name = Genome
+product_path = Packages
+comps = /usr/share/revisor/comps/comps-f9.xml
+architecture = i386
+version = 9
+version_from = F9
+getsource = 0
+kickstart_include=1
+kickstart_default=1
+kickstart_file=/etc/revisor/conf.d/combo-ks.cfg
+iso_label=Genome-Combo-Fedora
+iso_basename=Genome-Combo-Fedora
-- 
cgit