[Fedora-spins] [spin-kickstarts/F-14] Use $basearch

[Bruno Wolff III]

commit a63734f02572c108c26cd0989e5f145e316873c4
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Thu Oct 14 00:53:55 2010 -0500

    Use $basearch
    
    It looks there probably still is time to get in an update using $basearch
    which is currently supported by livecd-creator. ($releasever won't be
    supported until livecd-creator-035 becomes available.)

 fedora-aos.ks            |    8 ++++----
 fedora-install-fedora.ks |    2 +-
 fedora-live-base.ks      |    8 ++++----
 fedora-live-mini.ks      |    8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/fedora-aos.ks b/fedora-aos.ks
index f04ebea..8f06dd8 100644
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -26,10 +26,10 @@ part / --size 550 --fstype ext3 --ondisk sda
 #
 # Repositories
 #
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=i386
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=$basearch
 
 #
 # Add all the packages after the base packages
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 184cb29..c735fa3 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -10,7 +10,7 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386 --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd
 repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-14&arch=i386
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 1acbf59..a193a4a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -17,10 +17,10 @@ xconfig --startxonboot
 part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=i386
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=$basearch
 
 %packages
 @base-x
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 19de9d8..ebbb2f5 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -12,10 +12,10 @@ xconfig --startxonboot
 part / --size 4096 --fstype ext4
 services --enabled=NetworkManager,messagebus --disabled=network,sshd
 
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=i386
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=$basearch
 
 %packages
 @base-x