fedora-release/compose f8-fedora.ks, 1.1.4.2, 1.1.4.3 livecd-fedora-base-desktop.ks, 1.1.4.2, 1.1.4.3

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23021/compose

Modified Files:
      Tag: F-8
	f8-fedora.ks livecd-fedora-base-desktop.ks 
Log Message:
Change the compose files to reference the right repos.



Index: f8-fedora.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/f8-fedora.ks,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- f8-fedora.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
+++ f8-fedora.ks	12 Dec 2007 19:08:10 -0000	1.1.4.3
@@ -5,8 +5,11 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=rawhide  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=fedora  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name=updates-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (@base is added by default unless you add --nobase to %packages)


Index: livecd-fedora-base-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-base-desktop.ks,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- livecd-fedora-base-desktop.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
+++ livecd-fedora-base-desktop.ks	12 Dec 2007 19:08:10 -0000	1.1.4.3
@@ -8,7 +8,7 @@
 part / --size 4096
 services --enabled=NetworkManager --disabled=network,sshd
 
-repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=fedora  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 
 %packages
 @base-x