git://git.onelab.eu
/
nodeconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added proper marking rules
[nodeconfig.git]
/
yum.conf.php
diff --git
a/yum.conf.php
b/yum.conf.php
index
5a88406
..
71af098
100755
(executable)
--- a/
yum.conf.php
+++ b/
yum.conf.php
@@
-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",
$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");
"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":
$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":
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;
}
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
# 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
EOF;
// Figure out which repositories we actually have on this