X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=yum.conf.php;h=71af0988535e679de9fa224318c3c7fffe49431b;hb=d33bb658fecb5693e3e3281a6bf68828a362f482;hp=8f6013f22def1ad85d91fdd7da22e18bc3e34eb6;hpb=d662c96723a437cb783ef873e825ad1da9af2639;p=nodeconfig.git

diff --git a/yum.conf.php b/yum.conf.php
index 8f6013f..71af098 100755
--- a/yum.conf.php
+++ b/yum.conf.php
@@ -5,7 +5,7 @@
 // Mark Huang <mlhuang@cs.princeton.edu>
 // Copyright (C) 2004-2006 The Trustees of Princeton University
 //
-// $Id: yum.conf.php,v 1.5 2007/03/22 17:57:23 faiyaza Exp $
+// $Id$
 //
 
 // For PLC_NAME and PLC_BOOT_HOST
@@ -47,24 +47,35 @@ if (isset($_REQUEST['mirrorlist']) &&
   $mirrors = array("http://coblitz.planet-lab.org/pub/fedora/linux",
 		   "http://fedora.gtlib.cc.gatech.edu/pub/fedora.redhat/linux",
 		   "http://download.fedoraproject.org/pub/fedora/linux",
-		   "ftp://rpmfind.net/linux/fedora",
 		   "http://mirrors.kernel.org/fedora");
+		   #"ftp://rpmfind.net/linux/fedora",  still uses the old style of directory hierarchy
   $releasever = $_REQUEST['releasever'];
   switch ($_REQUEST['repo']) {
   case "base":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/core/$releasever/\$ARCH/os/\n";
-    }
+  	if ( intval($releasever) >= 7 )
+	{
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/releases/$releasever/Everything/\$ARCH/os/\n";
+		}
+
+	} else {
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/core/$releasever/\$ARCH/os/\n";
+		}
+	}
     break;
   case "updates":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/core/updates/$releasever/\$ARCH/\n";
-    }
-    break;
-  case "extras":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/extras/$releasever/\$ARCH/\n";
-    }
+  	if ( intval($releasever) >= 7 )
+	{
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/updates/$releasever/\$ARCH/\n";
+		}
+
+	} else {
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/core/updates/$releasever/\$ARCH/\n";
+		}
+	}
     break;
   }
 
@@ -98,14 +109,6 @@ gpgcheck=$gpgcheck
 # PlanetLab builds its own versions of these tools
 exclude=iptables kernel kernel kernel-devel kernel-smp kernel-smp-devel kernel-xen0 kernel-xen0-devel kernel-xenU kernel-xenU-devel mysql ulogd
 
-[extras]
-name=Fedora Extras \$releasever - \$basearch
-mirrorlist=https://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=extras&releasever=\$releasever
-gpgcheck=$gpgcheck
-# PlanetLab builds its own versions of these tools
-exclude=iptables kernel kernel kernel-devel kernel-smp kernel-smp-devel kernel-xen0 kernel-xen0-devel kernel-xenU kernel-xenU-devel mysql ulogd
-
-
 EOF;
 
 // Figure out which repositories we actually have on this