More fixes for the move to Fedora 9...

6 files changed, 182 insertions, 160 deletions

diff --git a/genome-respin/cobbler/Fedora-i386.profiles b/genome-respin/cobbler/Fedora-i386.profiles
index 928c57d..d68f59d 100644
--- a/genome-respin/cobbler/Fedora-i386.profiles
+++ b/genome-respin/cobbler/Fedora-i386.profiles
@@ -2,40 +2,44 @@
 -
     depth: 1
     dhcp_tag: default
-    distro: F8-xen-i386
+    distro: F9-i386
     kernel_options: {}
-    kickstart: /etc/cobbler/F8.ks
+    kickstart: /etc/cobbler/Genome.ks
     ks_meta: {}
-    name: LargeGenomeGuest-Fedora-8-i386
+    name: GenomeGuest__Appliance-Fedora-9-i386
     owners:
         - admin
     parent: ''
-    repos: []
+    repos:
+        - f9-everything
+        - Fedora-9-genome-i386
+        - Fedora-9-genome-noarch
+        - f9-updates
     server: <<inherit>>
-    virt_bridge: xenbr0
+    virt_bridge: genomebr0
     virt_cpus: 1
     virt_file_size: 50
     virt_path: ''
-    virt_ram: 1536
+    virt_ram: 512
     virt_type: auto
 -
     depth: 1
     dhcp_tag: default
-    distro: F8-xen-i386
+    distro: F9-i386
     kernel_options: {}
-    kickstart: /etc/cobbler/Genome.ks
+    kickstart: /etc/cobbler/Cloud.ks
     ks_meta: {}
-    name: GenomeGuest__Appliance-Fedora-8-i386
+    name: Cloud__Appliance-Fedora-9-i386
     owners:
         - admin
     parent: ''
     repos:
-        - f8-everything
-        - Fedora-8-genome-i386
-        - Fedora-8-genome-noarch
-        - f8-updates
+        - f9-everything
+        - Fedora-9-genome-i386
+        - Fedora-9-genome-noarch
+        - f9-updates
     server: <<inherit>>
-    virt_bridge: xenbr0
+    virt_bridge: genomebr0
     virt_cpus: 1
     virt_file_size: 50
     virt_path: ''
@@ -44,69 +48,69 @@
 -
     depth: 1
     dhcp_tag: default
-    distro: F8-i386
+    distro: F9-i386
     kernel_options: {}
-    kickstart: /etc/cobbler/Cloud.ks
+    kickstart: /etc/cobbler/Genome.ks
     ks_meta: {}
-    name: Cloud__Appliance-Fedora-8-i386
+    name: Genome__Appliance-Fedora-9-i386
     owners:
         - admin
     parent: ''
     repos:
-        - f8-everything
-        - Fedora-8-genome-i386
-        - Fedora-8-genome-noarch
-        - f8-updates
+        - f9-everything
+        - Fedora-9-genome-noarch
+        - Fedora-9-genome-i386
+        - f9-updates
     server: <<inherit>>
-    virt_bridge: xenbr0
+    virt_bridge: genomebr0
     virt_cpus: 1
     virt_file_size: 50
     virt_path: ''
-    virt_ram: 512
+    virt_ram: 1536
     virt_type: auto
 -
     depth: 1
     dhcp_tag: default
-    distro: F8-i386
+    distro: F9-i386
     kernel_options: {}
-    kickstart: /etc/cobbler/Genome.ks
+    kickstart: /etc/cobbler/F9.ks
     ks_meta: {}
-    name: Genome__Appliance-Fedora-8-i386
+    name: NormalGenomeGuest-Fedora-9-i386
     owners:
         - admin
     parent: ''
     repos:
-        - f8-everything
-        - Fedora-8-genome-noarch
-        - Fedora-8-genome-i386
-        - f8-updates
+        - f9-everything
+        - Fedora-9-genome-noarch
+        - Fedora-9-genome-i386
+        - f9-updates
     server: <<inherit>>
-    virt_bridge: xenbr0
+    virt_bridge: genomebr0
     virt_cpus: 1
-    virt_file_size: 50
+    virt_file_size: 25
     virt_path: ''
-    virt_ram: 1536
+    virt_ram: 1024
     virt_type: auto
 -
     depth: 1
     dhcp_tag: default
-    distro: F8-xen-i386
+    distro: F9-i386
     kernel_options: {}
-    kickstart: /etc/cobbler/F8.ks
+    kickstart: /etc/cobbler/F9.ks
     ks_meta: {}
-    name: NormalGenomeGuest-Fedora-8-i386
+    name: LargeGenomeGuest-Fedora-9-i386
     owners:
         - admin
     parent: ''
     repos:
-        - f8-everything
-        - Fedora-8-genome-noarch
-        - Fedora-8-genome-i386
-        - f8-updates
+        - f9-everything
+        - Fedora-9-genome-noarch
+        - Fedora-9-genome-i386
+        - f9-updates
     server: <<inherit>>
-    virt_bridge: xenbr0
+    virt_bridge: genomebr0
     virt_cpus: 1
-    virt_file_size: 25
+    virt_file_size: 50
     virt_path: ''
-    virt_ram: 1024
+    virt_ram: 1536
     virt_type: auto
diff --git a/genome-respin/cobbler/Fedora-i386.repos b/genome-respin/cobbler/Fedora-i386.repos
index 15506a7..2595aa6 100644
--- a/genome-respin/cobbler/Fedora-i386.repos
+++ b/genome-respin/cobbler/Fedora-i386.repos
@@ -4,9 +4,9 @@
     createrepo_flags: -c cache
     depth: 2
     keep_updated: False
-    mirror: 'http://download.fedora.redhat.com/pub/fedora/linux/updates/8/i386/'
+    mirror: 'http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/i386/os/'
     mirror_locally: 0
-    name: f8-updates
+    name: f9-everything
     owners:
         - admin
     parent: ''
@@ -18,9 +18,9 @@
     createrepo_flags: -c cache
     depth: 2
     keep_updated: False
-    mirror: 'http://download.fedora.redhat.com/pub/epel/5/i386/'
+    mirror: 'http://download.fedora.redhat.com/pub/fedora/linux/updates/9/i386/'
     mirror_locally: 0
-    name: epel5-i386
+    name: f9-updates
     owners:
         - admin
     parent: ''
@@ -32,9 +32,9 @@
     createrepo_flags: -c cache
     depth: 2
     keep_updated: False
-    mirror: 'http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/i386/os/'
+    mirror: 'http://download.fedora.redhat.com/pub/epel/5/i386/'
     mirror_locally: 0
-    name: f8-everything
+    name: epel5-i386
     owners:
         - admin
     parent: ''
@@ -60,9 +60,9 @@
     createrepo_flags: -c cache
     depth: 2
     keep_updated: True
-    mirror: 'http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-8-genome-noarch'
+    mirror: 'http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-9-genome-noarch'
     mirror_locally: 1
-    name: Fedora-8-genome-noarch
+    name: Fedora-9-genome-noarch
     owners:
         - admin
     parent: ''
@@ -74,9 +74,9 @@
     createrepo_flags: -c cache
     depth: 2
     keep_updated: True
-    mirror: 'http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-8-genome-i386'
+    mirror: 'http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-9-genome-i386'
     mirror_locally: 1
-    name: Fedora-8-genome-i386
+    name: Fedora-9-genome-i386
     owners:
         - admin
     parent: ''
diff --git a/genome-respin/genome-respin.spec b/genome-respin/genome-respin.spec
index 653a673..8538a5a 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: 1
+Release: 3%{?dist}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Group: Applications/System
@@ -41,6 +41,6 @@ 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/genome-f8-i386.conf
+/etc/revisor/conf.d/genome-f9-i386.conf
 
 %doc
diff --git a/genome-respin/repo/conf.d/genome-f8-i386.conf b/genome-respin/repo/conf.d/genome-f8-i386.conf
deleted file mode 100644
index 724d4a9..0000000
--- a/genome-respin/repo/conf.d/genome-f8-i386.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-[main]
-cachedir=-yumcache
-reposdir=
-keepcache=1
-debuglevel=1
-logfile=revisor-yum.log
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-plugins=0
-metadata_expire=15
-installroot=/var/tmp/revisor
-
-[f8-genome-noarch]
-name=f8-genome-noarch
-baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-8-genome-noarch
-enabled=1
-gpgcheck=0
-
-[f8-genome-i386]
-name=f8-genome-i386
-baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-8-genome-i386
-enabled=1
-gpgcheck=0
-
-[fedora]
-name=Fedora 8 - Werewolf - i386
-#baseurl=http://localrepo/fedora/releases/8/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=i386
-enabled=1
-gpgcheck=1
-
-[fedora-debuginfo]
-name=Fedora 8 - Werewolf - Debug - i386
-#baseurl=http://localrepo/fedora/releases/8/Everything/i386/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-8&arch=i386
-enabled=0
-gpgcheck=1
-
-[fedora-source]
-name=Fedora 8 - Werewolf - Source
-#baseurl=http://localrepo/fedora/releases/8/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-8&arch=i386
-enabled=0
-gpgcheck=1
-
-[updates]
-name=Fedora 8 - i386 - Updates
-#baseurl=http://localrepo/fedora/updates/8/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f8&arch=i386
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-debuginfo]
-name=Fedora 8 - i386 - Updates - Debug
-#baseurl=http://localrepo/fedora/updates/8/i386/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f8&arch=i386
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-source]
-name=Fedora 8 - Updates Source
-#baseurl=http://localrepo/fedora/updates/8/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f8&arch=i386
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-testing]
-name=Fedora 8 - i386 - Test Updates
-#baseurl=http://localrepo/fedora/updates/testing/8/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f8&arch=i386
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
-
-[updates-testing-debuginfo]
-name=Fedora 8 - i386 - Test Updates Debug
-#baseurl=http://localrepo/fedora/updates/testing/8/i386/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f8&arch=i386
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
-
-[updates-testing-source]
-name=Fedora 8 - Test Updates Source
-#baseurl=http://localrepo/fedora/updates/testing/8/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f8&arch=i386
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
-
diff --git a/genome-respin/repo/conf.d/genome-f9-i386.conf b/genome-respin/repo/conf.d/genome-f9-i386.conf
new file mode 100644
index 0000000..83786f7
--- /dev/null
+++ b/genome-respin/repo/conf.d/genome-f9-i386.conf
@@ -0,0 +1,113 @@
+[main]
+cachedir=-yumcache
+reposdir=
+keepcache=1
+debuglevel=1
+logfile=-yum.log
+pkgpolicy=newest
+distroverpkg=redhat-release
+tolerant=1
+exactarch=1
+obsoletes=1
+gpgcheck=1
+plugins=0
+metadata_expire=15
+installroot=/var/tmp/revisor
+failovermethod=priority
+
+[f9-genome-noarch]
+name=f9-genome-noarch
+baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-9-genome-noarch
+enabled=1
+gpgcheck=0
+
+[f9-genome-i386]
+name=f9-genome-i386
+baseurl=http://ftp.redhat.com/pub/redhat/genome/yum/Fedora-9-genome-i386
+enabled=1
+gpgcheck=0
+
+[fedora]
+name=Fedora 9 - Sulphur - i386
+baseurl=http://localrepo/fedora/releases/9/Everything/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=i386
+enabled=1
+gpgcheck=1
+
+[fedora-debuginfo]
+name=Fedora 9 - Sulphur - Debug - i386
+baseurl=http://localrepo/fedora/releases/9/Everything/i386/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-9&arch=i386
+enabled=0
+gpgcheck=1
+
+[fedora-source]
+name=Fedora 9 - Sulphur - Source
+baseurl=http://localrepo/fedora/releases/9/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-9&arch=i386
+enabled=0
+gpgcheck=1
+
+[updates]
+name=Fedora 9 - i386 - Updates
+baseurl=http://localrepo/fedora/updates/9/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=i386
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-debuginfo]
+name=Fedora 9 - i386 - Updates - Debug
+baseurl=http://localrepo/fedora/updates/9/i386/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f9&arch=i386
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora 9 - Updates Source
+baseurl=http://localrepo/fedora/updates/9/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f9&arch=i386
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-testing]
+name=Fedora 9 - i386 - Test Updates
+baseurl=http://localrepo/fedora/updates/testing/9/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f9&arch=i386
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-debuginfo]
+name=Fedora 9 - i386 - Test Updates Debug
+baseurl=http://localrepo/fedora/updates/testing/9/i386/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f9&arch=i386
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora 9 - Test Updates Source
+baseurl=http://localrepo/fedora/updates/testing/9/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f9&arch=i386
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+# Anaconda Updates by Fedora Unity.
+# Sync the updates from rsync://elwood.kanarip.com/anaconda if needed
+[anaconda-updates]
+name=Anaconda Updates by Fedora Unity
+baseurl=http://localrepo/anaconda/f9/i386/
+    http://www.kanarip.com/anaconda/f9/i386/
+enabled=1
+gpgcheck=0
+
+[anaconda-updates-source]
+name=Anaconda Updates by Fedora Unity (Sources)
+baseurl=http://localrepo/anaconda/f9/SRPMS/
+    http://www.kanarip.com/anaconda/f9/SRPMS/
+enabled=0
+gpgcheck=0
diff --git a/genome-respin/repo/genome.conf b/genome-respin/repo/genome.conf
index af35325..0710fb9 100644
--- a/genome-respin/repo/genome.conf
+++ b/genome-respin/repo/genome.conf
@@ -26,13 +26,14 @@ clean_up=1
 ##
 ## Models
 ##
-[genome-f8-i386]
-main = /etc/revisor/conf.d/genome-f8-i386.conf
+[genome-f9-i386]
+main = /etc/revisor/conf.d/genome-f9-i386.conf
 product_name = Genome
 product_path = Packages
-comps = /usr/share/revisor/comps/comps-f8.xml
+comps = /usr/share/revisor/comps/comps-f9.xml
 architecture = i386
-version = 8
+version = 9
+version_from = F9
 getsource = 0
 kickstart_include=1
 kickstart_default=1
@@ -40,13 +41,14 @@ kickstart_file=/etc/revisor/conf.d/genome-ks.cfg
 iso_label=Genome-Fedora
 iso_basename=Genome-Fedora
 
-[cloud-f8-i386]
-main = /etc/revisor/conf.d/genome-f8-i386.conf
+[cloud-f9-i386]
+main = /etc/revisor/conf.d/genome-f9-i386.conf
 product_name = Cloud
 product_path = Packages
-comps = /usr/share/revisor/comps/comps-f8.xml
+comps = /usr/share/revisor/comps/comps-f9.xml
 architecture = i386
-version = 8
+version = 9
+version_from = F9
 getsource = 0
 kickstart_include=1
 kickstart_default=1