installation-guide

Merge lp:~dsmythies/installation-guide/ubuntu-20.04 into lp:~ubuntu-core-dev/installation-guide/ubuntu

  1. ubuntu-20.04
  2. Merge into ubuntu
Proposed by Doug Smythies
Status: Merged
Merged at revision: 557
Proposed branch: lp:~dsmythies/installation-guide/ubuntu-20.04
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 52 lines (+8/-8)
3 files modified
build/arch-options/linux (+1/-1)
build/entities/common.ent (+6/-6)
build/preseed.pl (+1/-1)
To merge this branch: bzr merge lp:~dsmythies/installation-guide/ubuntu-20.04
Reviewer Review Type Date Requested Status
Balint Reczey Approve
Review via email: mp+382889@code.launchpad.net

Commit message

version numbers do not seem to have been bumped for 20.04 yet.
This is being published on help.ubuntu.com tomorrow.

To post a comment you must log in.
Revision history for this message
Balint Reczey (rbalint) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/arch-options/linux'
2--- build/arch-options/linux 2018-04-24 23:38:46 +0000
3+++ build/arch-options/linux 2020-04-23 22:53:34 +0000
4@@ -4,5 +4,5 @@
5 archspec="$archspec;linux-any"
6 arch_kernel="Linux"
7 arch_parttype="Linux"
8-kernelversion="4.15"
9+kernelversion="5.4"
10 kernelpackage="linux-image"
11
12=== modified file 'build/entities/common.ent'
13--- build/entities/common.ent 2018-06-21 13:04:59 +0000
14+++ build/entities/common.ent 2020-04-23 22:53:34 +0000
15@@ -4,7 +4,7 @@
16
17 <!-- current year (to be used for copyright declaration). -->
18 <!-- When changing this, also change in "debian/copyright" file)! -->
19-<!ENTITY current-year "2018">
20+<!ENTITY current-year "2020">
21
22 <!-- short name to use for Debian -->
23 <!-- we substitute Ubuntu's name here, so that we can reduce the number of
24@@ -22,11 +22,11 @@
25 <!ENTITY d-i "<classname>debian-installer</classname>">
26 <!ENTITY d-i-short "<classname>d-i</classname>">
27
28-<!ENTITY release "18.04">
29-<!ENTITY releasename "bionic">
30-<!ENTITY longreleasename "<quote>Bionic Beaver</quote>">
31-<!ENTITY releasename-cap "Bionic">
32-<!ENTITY releasename-uc "BIONIC">
33+<!ENTITY release "20.04">
34+<!ENTITY releasename "focal">
35+<!ENTITY longreleasename "<quote>Focal Fossa</quote>">
36+<!ENTITY releasename-cap "Focal">
37+<!ENTITY releasename-uc "FOCAL">
38
39 <!ENTITY FIXME
40 "<emphasis>Documentation not complete, text missing.</emphasis>">
41
42=== modified file 'build/preseed.pl'
43--- build/preseed.pl 2018-07-03 18:02:54 +0000
44+++ build/preseed.pl 2020-04-23 22:53:34 +0000
45@@ -73,7 +73,7 @@
46 $text =~ s/&releasename;/$release/g;
47 $text =~ s/&arch-title;/$arch/g;
48 $text =~ s/&kernelpackage;/linux-image/g;
49- $text =~ s/&kernelversion;/4.15/g;
50+ $text =~ s/&kernelversion;/5.4/g;
51 $text =~ s/&gt;/>/g;
52 $text =~ s/&lt;/</g;
53

Subscribers

People subscribed via source and target branches

to all changes: