aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2014-05-11 08:38:56 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2014-05-11 08:38:56 +0000
commit544a67140b168e8f9601b61fde1b71fc60a2df45 (patch)
treee2c5937bcb9ac2f718a54d5d68031567fb169e8d /en
parentd029a61c6fa092975ce469df01763f8094a20f64 (diff)
downloadwww-544a67140b168e8f9601b61fde1b71fc60a2df45.tar
www-544a67140b168e8f9601b61fde1b71fc60a2df45.tar.gz
www-544a67140b168e8f9601b61fde1b71fc60a2df45.tar.bz2
www-544a67140b168e8f9601b61fde1b71fc60a2df45.tar.xz
www-544a67140b168e8f9601b61fde1b71fc60a2df45.zip
netinstall always here
Diffstat (limited to 'en')
-rwxr-xr-xen/5/download_index.php6
-rw-r--r--en/downloads/get/definitions.ini39
2 files changed, 42 insertions, 3 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php
index ab22a6d84..64343c08f 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -35,14 +35,14 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
break;
}
-echo _r('forthcoming');
+/*echo _r('forthcoming');*/
-/*echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
+echo $torrent && $unavailabletorrent || $variant!='Boot' && $variant!='Boot-nonfree' ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'),
$torrent ? '&amp;torrent=1' : '',
implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
$bit
- ); */
+ );
}
?>
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 0a7cbae11..64a350475 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -679,3 +679,42 @@ path = "iso/4/Mageia-4-x86_64-DVD"
torrent = "iso/4/torrents/Mageia-4-x86_64-DVD.torrent"
name = "Mageia 4 64bit DVD"
size = "3.6 GB"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia 5
+;;;;;;;;;;;;;;;;;;;;;
+
+[Mageia-5-alpha1-Boot-i586-CD.iso]
+file = "boot.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha1 = ""
+name = "Mageia Cauldron Boot 32bit CD ISO"
+size = "28 MB"
+
+;
+[Mageia-5-alpha1-Boot-nonfree-i586-CD.iso]
+file = "boot-nonfree.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha1 = ""
+name = "Mageia Cauldron Boot Nonfree 32bit CD ISO"
+size= "39 MB"
+
+;
+[Mageia-5-alpha1-Boot-x86_64-CD.iso]
+file = "boot.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = ""
+sha1 = ""
+name = "Mageia Cauldron Boot 64bit CD ISO"
+size = "55 MB"
+
+;
+[Mageia-5-alpha1-Boot-nonfree-x86_64-CD.iso]
+file = "boot-nonfree.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = ""
+sha1 = ""
+name = "Mageia Cauldron Boot Nonfree 64bit CD ISO"
+size = "78 MB"