[Fedora-spins] [spin-kickstarts] Update repo definitions

[Bruno Wolff III]

commit ccbd53091df8fbe8c7a6472778dea99cdc565d13
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Aug 30 21:58:46 2010 -0500

    Update repo definitions
    
    At this point in the release cycle the fedora and updates repos should
    be enabled.
    The ks files for live spins that define these should be consistent with
    each other.

 fedora-aos.ks       |   15 ++++-----------
 fedora-live-base.ks |   14 ++++----------
 fedora-live-mini.ks |   14 ++++----------
 3 files changed, 12 insertions(+), 31 deletions(-)
---
diff --git a/fedora-aos.ks b/fedora-aos.ks
index ff0ee42..c6a913d 100644
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -26,17 +26,10 @@ part / --size 550 --fstype ext3 --ondisk sda
 #
 # Repositories
 #
-# To compose against the current release tree, use the following "repo" (enabled by default)
-#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
-# To include updates, use the following "repo" (enabled by default)
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
-
-# To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-
-# To compose against local trees, (edit and) use:
-#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
-#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 
 #
 # Add all the packages after the base packages
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index f911f9d..7e0d557 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -17,16 +17,10 @@ xconfig --startxonboot
 part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
-# To compose against the current release tree, use the following "repo" (enabled by default)
-#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
-# To include updates, use the following "repo" (enabled by default)
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=$basearch
-
-# To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-
-# To compose against local trees, (edit and) use:
-#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 
 %packages
 @base-x
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 2e3d33f..7272bdb 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -12,16 +12,10 @@ xconfig --startxonboot
 part / --size 4096 --fstype ext4
 services --enabled=NetworkManager,messagebus --disabled=network,sshd
 
-# To compose against the current release tree, use the following "repo" (enabled by default)
-#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
-# To include updates, use the following "repo" (enabled by default)
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=$basearch
-
-# To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-
-# To compose against local trees, (edit and) use:
-#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 
 %packages
 @base-x