X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=download%2Findex.html.tt2;h=accac916551f69668decfe70c7593cabff1e4706;hb=02fbfdec2a70d95baa9f169844b4b9602a21c3e3;hp=7cee4c2a9014bbb37271d40f9b279f09eac1e032;hpb=bd656a12e8cfb6cec132b2a833860f37caf6b2cc;p=grml.org.git

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 7cee4c2..accac91 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -77,40 +77,45 @@
 
 <div class="content">
 
-    <h1>Download Grml 2011.12</h1>
+    <h1>Download Grml 2018.12</h1>
 
     <p>Get the current stable release here.<br />
-    <a href="prerelease/">Looking for the current pre-release version instead?</a></p>
-
-    <p>Download Grml and then write it to a CD-R or an empty USB key.</p>
-
 
+    <a href="prerelease/">Looking for the current pre-release version instead?</a></p>
 
-    <p><a href="http://grml.org/changelogs/README-grml-2011.12">Release Notes</a></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/>
         <br/>
         Direct download links:<br/>
-        <a href="http://download.grml.org/grml96_2011.12.iso">Grml96 ISO</a> [<a href="http://download.grml.org/grml96_2011.12.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64_2011.12.iso">Grml64 ISO</a> [<a href="http://download.grml.org/grml64_2011.12.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32_2011.12.iso">Grml32 ISO</a> [<a href="http://download.grml.org/grml32_2011.12.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-full_2018.12.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/grml96-full_2018.12.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-full_2018.12.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/grml64-full_2018.12.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-full_2018.12.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/grml32-full_2018.12.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-small_2018.12.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/grml96-small_2018.12.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-small_2018.12.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/grml64-small_2018.12.iso.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-small_2018.12.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/grml32-small_2018.12.iso.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="2011.12"/>
+    <input type="hidden" name="version" value="2018.12"/>
     <div class="download_panel" id="download_panel1"><div>
 
-    <h2>Architecture</h2>
+    <h2>Options</h2>
 
+    <select name="flavour" id="download_flavour" style="width:100%;">
+    <option value="full" selected="selected">grml-full (~680MB)</option>
+    <option value="small">grml-small (~315MB)</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="both">One for both (700MB)</option>
+    <option value="i386">32-bit PC (i686+)</option>
+    <option value="96">One for both (~1.4GB)</option>
     </select>
     <br />
     <br />
@@ -118,10 +123,20 @@
     <br />
     <br />
 
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2012.05-rc1 instead!</span></a>
+    <!--
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2018.12-rc1 instead!</span></a>
+    <br />
+    <br />
     <br />
+    -->
 
-    </div></div>
+
+    <div style="font-size: 14pt;">
+    <p><a href="/changelogs/README-grml-2018.12">Release Notes</a></p>
+
+    </div>
+    </div>
+    </div>
 
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
@@ -142,20 +157,31 @@
 
     </form>
     <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 (i686+)</option><option value="96">One for both (~600MB)</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.4GB)</option>';
+        update_links();
+    }
+
     function update_links() {
-        var current_version = "2011.12";
-        var product = 'grml64';
+        var current_version = "2018.12";
+        var product = 'grml';
         var arch = document.getElementById('download_arch').value;
+        var flavour = document.getElementById('download_flavour').value;
+        if (arch == 'amd64') product = 'grml64';
         if (arch == 'i386') product = 'grml32';
-        if (arch == 'both') product = 'grml96';
-        var iso = product + '_' + current_version + '.iso';
+        if (arch == '96') product = 'grml96';
+        var iso = product + '-' + flavour + '_' + current_version + '.iso';
         var mirror_url = "http://download.grml.org/";
         document.getElementById('download_link_mirror').href = mirror_url + iso;
-        document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + ' ' + current_version + '</div>';
+        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';
-        document.getElementById('download_link_signature').href = mirror_url + iso + '.sha1.asc';
+        document.getElementById('download_link_signature').href = mirror_url + iso + '.asc';
     }
+
     // hook update function
+    document.getElementById('download_flavour').onchange = update_arch;
     document.getElementById('download_arch').onchange = update_links;
     // force initial link href set
     update_links();
@@ -171,31 +197,38 @@
 
     <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/grml_sources-2011.12.tar.gz">Source code</a> (both archs)<br />
+    <a href="https://daily.grml.org/">Daily images</a><br />
+    <a href="https://download.grml.org/">Older releases</a><br />
+    <a href="http://download.grml.org/grml_sources-2018.12.tar.gz">Source code</a> (one tgz for both archs)<br />
     <br/>
     Netboot packages:<br/>
-    <a href="http://download.grml.org/grml_netboot_package_grml64_2011.12.tar.bz2">64-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml64_2011.12.tar.bz2.sha1.asc">(sig)</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32_2011.12.tar.bz2">32-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32_2011.12.tar.bz2.sha1.asc">(sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2018.12.tar.bz2">64-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2018.12.tar.bz2.sha1.asc">(signed sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2018.12.tar.bz2">32-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2018.12.tar.bz2.sha1.asc">(signed 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;mail (at) michael-prokop.at&gt;
+Key fingerprint = 33CC B136 401A FEC8 43A3  8763 96A8 7872 B7EA 3737
+sub  4096R/257B6FD52892CF7E 2010-07-14</pre>
     </div></div>
 
     <div class="download_panel" id="download_panel4"><div>
     <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 key!<br /><br />
-    <code>dd if=grml64_2011.12.iso of=/dev/USB_KEY</code>
+    <code>dd if=grml64_2018.12.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>
@@ -204,9 +237,9 @@
 
     <h2>Git repositories</h2>
 
-    <p>The Grml team uses <a href="http://git-scm.com/">git</a> for
+    <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>
+    online at <a href="https://github.com/grml/">GitHub</a>.</p>
 
     <div style="clear: both;"></div>