commit: 4979237918a2e2b9bb8a9040d9ca78a12ae49faf
Author: Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Fri Feb 5 20:40:51 2016 +0000
Commit: Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 20:40:51 2016 +0000
URL: https://gitweb.gentoo.org/sites/www.git/commit/?id=49792379
downloads: Use new custom media name setup for AdminCDs
_includes/downloads/amd64-advanced.html | 4 ++--
_includes/downloads/x86-advanced.html | 7 ++++++-
bin/update-downloads.sh | 6 +++++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/_includes/downloads/amd64-advanced.html
b/_includes/downloads/amd64-advanced.html
index 286fc64..7dc10e9 100644
--- a/_includes/downloads/amd64-advanced.html
+++ b/_includes/downloads/amd64-advanced.html
@@ -1,7 +1,7 @@
<div class="col-xs-12 col-md-6">
<h4>Boot Media</h4>
<div class="list-group">
- {% include partials/download-link-raw.html
url='http://distfiles.gentoo.org/releases/amd64/autobuilds/current-admincd-amd64/'
title='Admin CD' size='381000000' date='2015-03-26' %}
+ {% include partials/download-link.html type="iso" arch="amd64"
id="hardened/admincd-amd64" title="Admin CD" %}
</div>
<h4>Stage Archives</h4>
@@ -28,4 +28,4 @@
The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs
as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors.
</p>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/_includes/downloads/x86-advanced.html
b/_includes/downloads/x86-advanced.html
index 245e366..3fc4c0e 100644
--- a/_includes/downloads/x86-advanced.html
+++ b/_includes/downloads/x86-advanced.html
@@ -1,4 +1,9 @@
<div class="col-xs-12 col-md-6">
+ <h4>Boot Media</h4>
+ <div class="list-group">
+ {% include partials/download-link.html type="iso" arch="x86"
id="hardened/admincd-x86" title="Admin CD" %}
+ </div>
+
<h4>Stage Archives</h4>
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="x86" id="i486"
title="Stage 3" tag="i486" %}
@@ -21,4 +26,4 @@
Processors prior to the <strong>Intel Pentium Pro</strong> or
<strong>Pentium II</strong> require the <em>i486</em> variant to be used.
</p>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/bin/update-downloads.sh b/bin/update-downloads.sh
index 2191f13..386de1f 100755
--- a/bin/update-downloads.sh
+++ b/bin/update-downloads.sh
@@ -8,11 +8,15 @@ for arch in "${ARCHES[@]}"; do
wget
"http://distfiles.gentoo.org/releases/${arch}/autobuilds/latest-iso.txt"; -O
_data/downloads/${arch}/iso.txt 2>/dev/null
wget
"http://distfiles.gentoo.org/releases/${arch}/autobuilds/latest-stage3.txt"; -O
_data/downloads/${arch}/stage3.txt 2>/dev/null
- if [ ${arch} = "s390" ]; then
+ if [ ${arch} = "amd64" ]; then
+ wget
"http://distfiles.gentoo.org/releases/amd64/autobuilds/latest-admincd-amd64.txt";
-O - >> _data/downloads/${arch}/iso.txt 2>/dev/null
+ elif [ ${arch} = "s390" ]; then
wget
"http://distfiles.gentoo.org/releases/s390/autobuilds/latest-netboot-s390-initramfs.txt";
-O - >> _data/downloads/${arch}/iso.txt 2>/dev/null
wget
"http://distfiles.gentoo.org/releases/s390/autobuilds/latest-netboot-s390-kernel.txt";
-O - >> _data/downloads/${arch}/iso.txt 2>/dev/null
wget
"http://distfiles.gentoo.org/releases/s390/autobuilds/latest-netboot-s390x-initramfs.txt";
-O - >> _data/downloads/${arch}/iso.txt 2>/dev/null
wget
"http://distfiles.gentoo.org/releases/s390/autobuilds/latest-netboot-s390x-kernel.txt";
-O - >> _data/downloads/${arch}/iso.txt 2>/dev/null
+ elif [ ${arch} = "x86" ]; then
+ wget
"http://distfiles.gentoo.org/releases/x86/autobuilds/latest-admincd-x86.txt"; -O
- >> _data/downloads/${arch}/iso.txt 2>/dev/null
fi
done
