X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=yum.conf.php;h=71af0988535e679de9fa224318c3c7fffe49431b;hb=d6d22f9779fe97c8176ed2171b9ac238043f93bd;hp=74a338c246d3236c75f4517c579470369322c936;hpb=7482589cacbd077d0f72246a93ab9c61e7afdd43;p=nodeconfig.git

diff --git a/yum.conf.php b/yum.conf.php
index 74a338c..71af098 100755
--- a/yum.conf.php
+++ b/yum.conf.php
@@ -47,19 +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";
-    }
+  	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;
   }