Merge lp:~xnox/debian-installer/deprecated-ubuntu into lp:~ubuntu-core-dev/debian-installer/ubuntu

Proposed by Dimitri John Ledkov on 2020-03-26
Status: Needs review
Proposed branch: lp:~xnox/debian-installer/deprecated-ubuntu
Merge into: lp:~ubuntu-core-dev/debian-installer/ubuntu
Diff against target: 172 lines (+137/-1)
4 files modified
debian/FOOTER.html (+25/-0)
debian/HEADER.html (+103/-0)
debian/changelog (+7/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~xnox/debian-installer/deprecated-ubuntu
Reviewer Review Type Date Requested Status
Paride Legovini (community) 2020-03-26 Approve on 2020-03-27
Canonical Foundations Team 2020-03-26 Pending
Ubuntu Core Development Team 2020-03-26 Pending
Review via email: mp+381214@code.launchpad.net

Commit message

This changes all d-i urls from /images/ to /deprecated-images/

Also it adds a nice HEADER.html/FOOTER.html to celebrate the new Ubuntu Server Installer

I uploaded example into my PPA and it looks like this:

http://ppa.launchpad.net/xnox/nonvirt/ubuntu/dists/focal/main/installer-amd64/current/deprecated-images/

To post a comment you must log in.
Paride Legovini (legovini) wrote :

Hi Dimitri,

Should the content of FOOTER.html show up in the example page you prepared? It seems it does not.

review: Needs Information
Dimitri John Ledkov (xnox) wrote :

@paride well spotted, whilst it is correct it seems like apache is missconfigured. Also footer is not getting shown on cdimage.ubuntu.com either

I will open separate bugs about that.

The expectation was for footer to look like it does on http://releases.ubuntu.com/bionic/

And broken behaviour is visible on the my ppa sample and on http://cdimage.ubuntu.com/daily-live/pending/

Dimitri John Ledkov (xnox) wrote :

Opened https://bugs.launchpad.net/ubuntu/+bug/1869218 for the FOOTER.html not getting rendered.

Paride Legovini (legovini) wrote :

In general looks good. I would add a

<h2>Deprecated images</h2>

header right before the "The deprecated Ubuntu Installer is still available below ..." paragraph. In its current form the file list appears to be under the "Try the New Ubuntu Installer" section, and at first glance this could wrongly suggest that the files below *are* the New Ubuntu Installer.

Paride Legovini (legovini) wrote :

If we want to keep all those pages with a single <h2> section (reasonable), then I'd still change it to:

<h2>Deprecated images</h2>

for clarity.

2367. By Dimitri John Ledkov on 2020-03-26

Clarify headers in the HEADER.html

Paride Legovini (legovini) wrote :

LGTM

review: Approve
2368. By Dimitri John Ledkov on 2020-03-27

Move warning that no updates will be made, to the second heading

Paride Legovini (legovini) wrote :

+1

review: Approve

Unmerged revisions

2368. By Dimitri John Ledkov on 2020-03-27

Move warning that no updates will be made, to the second heading

2367. By Dimitri John Ledkov on 2020-03-26

Clarify headers in the HEADER.html

2366. By Dimitri John Ledkov on 2020-03-26

Change URL of d-i images, add HEADER/FOOTER.html to celebrate the new
Ubuntu Server Installer.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/FOOTER.html'
2--- debian/FOOTER.html 1970-01-01 00:00:00 +0000
3+++ debian/FOOTER.html 2020-03-27 11:20:58 +0000
4@@ -0,0 +1,25 @@
5+</div></div></div></div>
6+<footer class="p-footer">
7+ <div class="row">
8+ <p><small>&copy; 2020 Canonical Ltd. Ubuntu and Canonical
9+ are registered trademarks of Canonical Ltd.</small></p>
10+ <nav class="p-footer__nav">
11+ <ul class="p-footer__links">
12+ <li class="p-footer__item">
13+ <a class="p-footer__link"
14+ href="https://ubuntu.com/legal"><small>Legal
15+ information</small></a>
16+ </li>
17+ <li class="p-footer__item">
18+ <a class="p-footer__link"
19+ href="https://bugs.launchpad.net/ubuntu/+source/debian-installer/+filebug?no-redirect">
20+ <small>Report a bug on this site</small></a>
21+ </li>
22+ </ul>
23+ <span class="u-off-screen">
24+ <a href="#">Go to the top of the page</a>
25+ </span>
26+ </nav>
27+ </div>
28+</footer>
29+</body></html>
30
31=== added file 'debian/HEADER.html'
32--- debian/HEADER.html 1970-01-01 00:00:00 +0000
33+++ debian/HEADER.html 2020-03-27 11:20:58 +0000
34@@ -0,0 +1,103 @@
35+<!doctype html>
36+<html lang="en">
37+<head>
38+<title>Deprecated Ubuntu Server Installer</title>
39+<meta charset="UTF-8" />
40+<meta name="description" content="Deprecated Ubuntu Server Installer" />
41+<meta name="author" content="Canonical" />
42+<meta name="viewport" content="width=device-width, initial-scale=1" />
43+<!-- Main style sheets for CSS2 capable browsers -->
44+<style type="text/css" media="screen">
45+ .p-strip--image {
46+ background-image: url('https://assets.ubuntu.com/v1/775cc62b-vanilla-grad-background.png');
47+ background-position: 75% 25%;
48+ }
49+
50+ .p-table-wrapper {
51+ overflow-x: scroll;
52+ }
53+
54+ table {
55+ min-width: 984px;
56+ width: 100%;
57+ }
58+
59+ th[colspan="5"],
60+ th[colspan="4"] {
61+ display: none;
62+ }
63+
64+ th:first-child,
65+ td:first-child {
66+ vertical-align: inherit;
67+ width: 5%;
68+ }
69+
70+ th:nth-of-type(2),
71+ td:nth-of-type(2) {
72+ width: 20em;
73+ }
74+
75+ th:nth-of-type(3),
76+ td:nth-of-type(3) {
77+ width: 12em;
78+ }
79+
80+ th:nth-of-type(4),
81+ td:nth-of-type(4) {
82+ width: 6em;
83+ }
84+
85+ th:nth-of-type(5),
86+ td:nth-of-type(5) {
87+ }
88+</style>
89+
90+<link href='https://assets.ubuntu.com/v1/vanilla-framework-version-1.8.0.min.css' rel='stylesheet' type='text/css'>
91+</head>
92+<body>
93+ <header id="navigation" class="p-navigation">
94+ <div class="row">
95+ <div class="p-navigation__banner">
96+ <div class="p-navigation__logo">
97+ <a class="p-navigation__link" href="/">
98+ <img class="p-navigation__image"
99+ src=" https://assets.ubuntu.com/v1/411e1474-releases-lockup.svg"
100+ alt="">
101+ </a>
102+ </div>
103+ </div>
104+ <nav class="p-navigation__nav" role="menubar">
105+ <span class="u-off-screen">
106+ <a href="#pageWrapper">Jump to main content</a>
107+ </span>
108+ </nav>
109+ </div>
110+ </header>
111+ <section class="p-strip--image is-dark">
112+ <div class="row">
113+ <div id="header"><a href="https://ubuntu.com/"></a></div>
114+ <h1 class="u-no-margin--bottom">Deprecated Ubuntu Server Installer</h1>
115+ </div>
116+ </section>
117+ <div id="pageWrapper" class="p-strip">
118+ <div class="row">
119+ <div id="main">
120+
121+<h2>Try the New Ubuntu Server Installer</h2>
122+
123+<p>The <a href="https://ubuntu.com/download/server">new Ubuntu Server
124+Installer</a> now supports all Server hardware platforms, unattended
125+autoinstall, offline installation, network-gapped install, PXE and
126+HTTP boot, RAID, LVM, LUKS, among other things.</p>
127+
128+<p>Get help migrating to the new Server Installer
129+on <a href="https://discourse.ubuntu.com/c/server">Ubuntu
130+Discourse</a>!</p>
131+
132+<h2>Deprecated Ubuntu Server Installer Images</h2>
133+
134+<p>The Deprecated Ubuntu Server Installer is still available below, but will
135+stop receiving updates in the future.</p>
136+
137+<div class='p-table-wrapper'>
138
139=== modified file 'debian/changelog'
140--- debian/changelog 2020-03-16 23:16:56 +0000
141+++ debian/changelog 2020-03-27 11:20:58 +0000
142@@ -1,3 +1,10 @@
143+debian-installer (20101020ubuntu609) UNRELEASED; urgency=medium
144+
145+ * Change URL of d-i images, add HEADER/FOOTER.html to celebrate the new
146+ Ubuntu Server Installer.
147+
148+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 26 Mar 2020 01:34:32 +0000
149+
150 debian-installer (20101020ubuntu608) focal; urgency=medium
151
152 * Re-enable build with focal-proposed.
153
154=== modified file 'debian/rules'
155--- debian/rules 2019-12-20 14:17:54 +0000
156+++ debian/rules 2020-03-27 11:20:58 +0000
157@@ -16,7 +16,7 @@
158
159 ARCHIVEDIR=debian/tmp/installer-$(ARCH)
160 DESTDIR=$(ARCHIVEDIR)/$(VERSION)
161-IMAGEDIR=$(DESTDIR)/images
162+IMAGEDIR=$(DESTDIR)/deprecated-images
163 TARNAME=debian-installer-images_$(VERSION)_$(ARCH).tar.gz
164
165 export NO_PNG_PKG_MANGLE=1
166@@ -73,6 +73,7 @@
167 dh_gencontrol
168 dh_md5sums
169 dh_builddeb
170+ cp debian/*.html $(IMAGEDIR)
171 cd debian/tmp && tar czvf ../../../$(TARNAME) .
172 dpkg-distaddfile $(TARNAME) raw-installer -
173

Subscribers

People subscribed via source and target branches