X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=download%2Fprerelease%2Findex.html.tt2;h=cd6c0f8bf57d40c5b985b1ba049798b6067cc746;hb=cb3b2a1cb2cc12f475f66c163ea09b9dd9071b5b;hp=49463e82780e682497f784cce6825bc192cac2b2;hpb=22e51ca5964643a18847e3ccc27807934d4576d7;p=grml.org.git

diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index 49463e8..cd6c0f8 100644
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -1,8 +1,3 @@
-<?php
-// while there is no prerelease, redirect to stable page
-header("Location: /download/");
-exit;
-?>
 <!DOCTYPE html>
 <html>
 <head>
@@ -12,10 +7,9 @@ exit;
 <meta name="Keywords" content="grml.org, grml" />
 <meta name="Description" content="Download of grml.org" />
 <meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/download/" />
 <meta name="Robots" content="index,follow" />
 <meta name="Language" content="english" />
-<meta name="identifier-url" content="http://www.grml.org/" />
+<meta name="identifier-url" content="https://grml.org/" />
 <meta name="MSSmartTagsPreventParsing" content="true" />
 <meta http-equiv="imagetoolbar" content="no" />
 <link rel="home" href="/" title="grml.org" />
@@ -33,7 +27,7 @@ exit;
     width: 288px;
     margin-bottom: 2em;
     margin-top: 1em;
-    font-size: 11px;
+    font-size: 10pt;
 }
 .download_panel>div {
     margin-right: 20px;
@@ -82,54 +76,59 @@ exit;
 
 <div class="content">
 
-    <h1>Download Grml 2014.10-rc1</h1>
+    <h1>Download Grml 2020.06-rc1</h1>
 
     <p><strong>NOTE: This is a PRE-RELEASE, not a stable release yet.<br />
     You have been warned.</strong><br />
 
     <a href="../">Looking for the stable release version instead?</a></p>
 
-    <p>Download the Grml flavour you need, then write it to a CD-R or an empty USB stick.</p>
+    <p>Download the Grml flavour you need, then write it to a CD-ROM/DVD or an empty USB stick.</p>
 
     <div class="download_group" id="download_group1_noscript">
     <div class="download_panel" id="download_panel1_noscript"><div>
-        <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
+        <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
         <br/>
         Direct download links:<br/>
-        <a href="http://download.grml.org/devel/grml96-full_2014.10-rc1.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/devel/grml96-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml64-full_2014.10-rc1.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/devel/grml64-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml32-full_2014.10-rc1.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/devel/grml32-full_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml96-small_2014.10-rc1.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/devel/grml96-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml64-small_2014.10-rc1.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/devel/grml64-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/devel/grml32-small_2014.10-rc1.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/devel/grml32-small_2014.10-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml96-full_2020.06-rc1.iso">Grml96 full ISO</a> [<a href="https://download.grml.org/devel/grml96-full_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml64-full_2020.06-rc1.iso">Grml64 full ISO</a> [<a href="https://download.grml.org/devel/grml64-full_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml32-full_2020.06-rc1.iso">Grml32 full ISO</a> [<a href="https://download.grml.org/devel/grml32-full_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml96-small_2020.06-rc1.iso">Grml96 small ISO</a> [<a href="https://download.grml.org/devel/grml96-small_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml64-small_2020.06-rc1.iso">Grml64 small ISO</a> [<a href="https://download.grml.org/devel/grml64-small_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/devel/grml32-small_2020.06-rc1.iso">Grml32 small ISO</a> [<a href="https://download.grml.org/devel/grml32-small_2020.06-rc1.iso.sha1.asc">Signature</a>]<br/>
         <br/>
         </div></div>
     </div>
 
     <div class="download_group" id="download_group1" style="display:none;">
     <form method="get" action="/download/bounce/">
-    <input type="hidden" name="version" value="2014.10-rc1"/>
+    <input type="hidden" name="version" value="2020.06-rc1"/>
     <div class="download_panel" id="download_panel1"><div>
 
     <h2>Options</h2>
 
     <select name="flavour" id="download_flavour" style="width:100%;">
-    <option value="full" selected="selected">grml-full (~415MB)</option>
-    <option value="small">grml-small (~195MB)</option>
+    <option value="full" selected="selected">grml-full (~760MB)</option>
+    <option value="small">grml-small (~360MB)</option>
     </select>
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
-    <option value="i386">32-bit PC (i586+)</option>
-    <option value="96">One for both (~800MB)</option>
+    <option value="i386">32-bit PC (i686+)</option>
+    <option value="96">One for both (~1.45GB)</option>
     </select>
     <br />
     <br />
     <br />
     <br />
     <br />
-    <a href="/changelogs/README-grml-2014.10-rc1/">Release Notes</a>
-    </div></div>
+
+    <div style="font-size: 14pt;">
+    <p><a href="/changelogs/README-grml-2020.06-rc1/">Release Notes</a></p>
+
+    </div>
+    </div>
+    </div>
 
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
@@ -139,6 +138,7 @@ exit;
     <button name="filetype" value="bt" id="download_button_bt" type="submit">Download using BitTorrent</button><br />
 -->
     <button name="filetype" value="signature" id="download_button_signature" type="submit">Get Checksum/Signature</button><br />
+    <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
     </div>
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">
@@ -147,6 +147,7 @@ exit;
     <a id="download_link_bt">BitTorrent Download</a><br />
 -->
     <a id="download_link_signature">Get Checksum/Signature</a><br />
+    <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
     </div>
     </div></div>
 
@@ -154,13 +155,13 @@ exit;
     <script type="text/javascript">
     function update_arch() {
         var flavour = document.getElementById('download_flavour').value;
-        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~378MB)</option>';
-        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~817MB)</option>';
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~685MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~1.45GB)</option>';
         update_links();
     }
 
     function update_links() {
-        var current_version = "2014.10-rc1";
+        var current_version = "2020.06-rc1";
         var product = 'grml';
         var arch = document.getElementById('download_arch').value;
         var flavour = document.getElementById('download_flavour').value;
@@ -168,7 +169,7 @@ exit;
         if (arch == 'i386') product = 'grml32';
         if (arch == '96') product = 'grml96';
         var iso = product + '-' + flavour + '_' + current_version + '.iso';
-        var mirror_url = "http://download.grml.org/devel/";
+        var mirror_url = "https://download.grml.org/devel/";
         document.getElementById('download_link_mirror').href = mirror_url + iso;
         document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + '-' + flavour + ' ' + current_version + '</div>';
         // document.getElementById('download_link_bt').href = mirror_url + iso + '.torrent';
@@ -192,33 +193,51 @@ exit;
 
     <div class="download_panel" id="download_panel3"><div>
     <b>Alternate downloads</b><br /><br />
-    <a href="http://daily.grml.org/">Daily images</a><br />
-    <a href="http://download.grml.org/">Older releases</a><br />
-<!--
-    <a href="http://download.grml.org/devel/">chroots for remastering</a> (prerelease)<br />
--->
-    <a href="http://download.grml.org/devel/grml_sources-2014.10-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />
+    <a href="https://daily.grml.org/">Daily images</a><br />
+    <a href="https://download.grml.org/">Older releases</a><br />
+    <a href="https://download.grml.org/devel/grml_sources-2020.06-rc1.tar.gz">Source code</a> (one tgz for both architectures)<br />
+    <br/>
+    Netboot packages:<br/>
+    <a href="https://download.grml.org/devel/grml_netboot_package_grml64-full_2020.06-rc1.tar.bz2">64-bit</a>
+    <a href="https://download.grml.org/devel/grml_netboot_package_grml64-full_2020.06-rc1.tar.bz2.sha1.asc">(sig)</a>
+    <a href="https://download.grml.org/devel/grml_netboot_package_grml32-full_2020.06-rc1.tar.bz2">32-bit</a>
+    <a href="https://download.grml.org/devel/grml_netboot_package_grml32-full_2020.06-rc1.tar.bz2.sha1.asc">(sig)</a>
+
+    <br />
     <br />
-    <a href="http://debian.netcologne.de/grml/gnupg-michael-prokop.txt">Signing Key</a><br />
+    <b>Signing Key</b>
     <br />
     Please verify all downloads using GnuPG!
+    <br />
+    For each released ISO image there is also a signature file, that should be verified with the following
+    <a href="https://grml.org/download/gnupg-michael-prokop.txt">signing key</a>:
+    <pre>pub  4096R/96A87872B7EA3737 2010-07-14 Michael Prokop &lt;mika (at) grml.org&gt;
+Key  fingerprint = 33CC B136 401A FEC8 43A3  8763 96A8 7872 B7EA 3737
+sub  rsa4096/257B6FD52892CF7E 2010-07-14 [E]
+sub  rsa4096/43A1FB9BCC87C963 2018-07-26 [A] [expires: 2022-05-20]</pre>
     </div></div>
 
     <div class="download_panel" id="download_panel4"><div>
-    <b>Boot from USB stick</b><br />
+    <b>Boot from USB key</b><br />
     <br />
-    Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overwritten by the dd command!">empty</abbr> USB stick!<br /><br />
-    <code>dd if=grml_2014.10-rc1.iso of=/dev/USB_STICK</code>
+    Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overwritten by the dd command!">empty</abbr> USB key!<br /><br />
+    <code>dd if=grml_2020.06-rc1.iso of=/dev/USB_KEY</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
-    <a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
+    <a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
     <br /><br />
 
     </div></div>
 
     </div>
 
+    <h2>Git repositories</h2>
+
+    <p>The Grml team uses <a href="https://git-scm.com/">git</a> for
+    managing software and packages. The repositories are available
+    online at <a href="https://github.com/grml/">GitHub</a>.</p>
+
     <div style="clear: both;"></div>
 
 </div>
