diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-25 08:45:04 -0400 |
|---|---|---|
| committer | root <root@dhcp226-35.rdu.redhat.com> | 2008-07-28 09:11:57 -0400 |
| commit | 0b84ef6bd550b66d98073c000c24e98e4e96d47c (patch) | |
| tree | 7fd0b59c57dfcbbb3033e44a3fd20ce3c118339d /genome-respin | |
| parent | e7da05b82a597185a4ace203735029c37adbe6fb (diff) | |
| download | tools-0b84ef6bd550b66d98073c000c24e98e4e96d47c.tar.gz tools-0b84ef6bd550b66d98073c000c24e98e4e96d47c.tar.xz tools-0b84ef6bd550b66d98073c000c24e98e4e96d47c.zip | |
Minor changes to the respin
The genome-release RPM is where we store all yum repo information
Fixes:
https://fedorahosted.org/genome/ticket/26
https://fedorahosted.org/genome/ticket/22
https://fedorahosted.org/genome/ticket/23
Diffstat (limited to 'genome-respin')
| -rw-r--r-- | genome-respin/genome-respin.spec | 2 | ||||
| -rw-r--r-- | genome-respin/repo/conf.d/combo-ks.cfg | 39 |
2 files changed, 11 insertions, 30 deletions
diff --git a/genome-respin/genome-respin.spec b/genome-respin/genome-respin.spec index 0370c34..7f78a48 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.1 -Release: 1%{?dist} +Release: 8%{?dist} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Group: Applications/System diff --git a/genome-respin/repo/conf.d/combo-ks.cfg b/genome-respin/repo/conf.d/combo-ks.cfg index f1f0750..7078463 100644 --- a/genome-respin/repo/conf.d/combo-ks.cfg +++ b/genome-respin/repo/conf.d/combo-ks.cfg @@ -16,7 +16,7 @@ lang en_US # Use CDROM installation media cdrom # Network information -network --bootproto=dhcp --device=eth0 --onboot=on +network --bootproto=dhcp --onboot=on # Reboot after installation reboot --eject # Root password @@ -36,16 +36,13 @@ 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 +partition pv.01 --size=51200 --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 +kernel kvm bridge-utils vim-enhanced @@ -53,6 +50,7 @@ yum -yum-updatesd httpd-cloudmasterd rubygem-cloudmasterd +genome-release genome-bridge genome-repo rubygem-genome-bootstrap @@ -85,29 +83,12 @@ sed -i "s/autosign = no/autosign = yes/g" /etc/certmaster/certmaster.conf /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 +# We hit some problems with revisor related to the updates repositories. +# Basically we don't include them on the iso anymore and rely on this post +# update process. +/usr/bin/yum update -y -echo """ -[genome-noarch] -name=genome-noarch -baseurl=http://brenton.fedorapeople.org/genome/yum/$RELEASE-\$releasever-genome-noarch -enabled=1 -priority=99 -gpgcheck=0 - -[genome-\$basearch] -name=genome-\$basearch -baseurl=http://brenton.fedorapeople.org/genome/yum/$RELEASE-\$releasever-genome-\$basearch -enabled=1 -priority=99 -gpgcheck=0 -""" > /etc/yum.repos.d/genome.repo +# create the dir needed for the disk images +/bin/mkdir /images %end |