aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2018-12-02 00:12:31 +0100
committerManuel Hiebel <leuhmanu@mageia.org>2018-12-02 00:12:31 +0100
commit9e6c8834088217dc43db7d2660e6527cacb23d90 (patch)
tree7fd89b47b59d3d427a5cc0f08bf1f48df2076659 /en
parent0e9e6f05b797bb6f2864ff7cc1f8324c270de833 (diff)
downloadwww-9e6c8834088217dc43db7d2660e6527cacb23d90.tar
www-9e6c8834088217dc43db7d2660e6527cacb23d90.tar.gz
www-9e6c8834088217dc43db7d2660e6527cacb23d90.tar.bz2
www-9e6c8834088217dc43db7d2660e6527cacb23d90.tar.xz
www-9e6c8834088217dc43db7d2660e6527cacb23d90.zip
Import Cauldron / Mageia 7 beta / netinstall iso
Diffstat (limited to 'en')
-rw-r--r--en/downloads/alternative/index.php4
-rw-r--r--en/downloads/get/definitions.ini42
2 files changed, 44 insertions, 2 deletions
diff --git a/en/downloads/alternative/index.php b/en/downloads/alternative/index.php
index 6c3127126..2ed7e88b7 100644
--- a/en/downloads/alternative/index.php
+++ b/en/downloads/alternative/index.php
@@ -1,7 +1,7 @@
<?php
$current = '6.1';
-$cauldron = 'cauldron';
+$cauldron = '7';
define('HLANG', true);
@@ -62,7 +62,7 @@ $size = $values['size'];
if ($release == $current){
$tableCurrent .= TableContent($section, $name, $torrent, $magnet, $size);
- }elseif ($release == $cauldron){
+ }elseif ($release == $cauldron || $release == "Cauldron") {
$tableCauldron .= TableContent($section, $name, $torrent, $magnet, $size);
}else{
$tableArchives .= TableContent($section, $name, $torrent, $magnet, $size);
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index ebb633fef..49c662a29 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -1449,3 +1449,45 @@ torrent = "iso/6/torrents/Mageia-6-x86_64-DVD.torrent"
magnet = "magnet:?xt=urn:btih:062c13a92b9421fccaf3d7e679a70758331130c6&dn=Mageia-6-x86_64-DVD"
name = "Mageia 6 64bit DVD"
size = "3.6 GB"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia Cauldron/7
+;;;;;;;;;;;;;;;;;;;;;
+
+
+;
+[Mageia-Cauldron-netinstall-i586-CD.iso]
+file = "Mageia-Cauldron-netinstall-i586.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall 32bit CD ISO"
+size = "41 MB"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-i586-CD.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-i586.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall Nonfree 32bit CD ISO"
+size= "69 MB"
+
+;
+[Mageia-Cauldron-netinstall-x86_64-CD.iso]
+file = "Mageia-Cauldron-netinstall-x86_64.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall 64bit CD ISO"
+size = "51 MB"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-x86_64-CD.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso"
+path = "distrib/6.1/x86_64/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall Nonfree 64bit CD ISO"
+size = "80 MB"