Merge lp:~frank-heimes/installation-guide/ubuntu-18.04-sys-req-arch into lp:~ubuntu-core-dev/installation-guide/ubuntu

Proposed by Frank Heimes on 2018-04-20
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2018-04-25
Approved revision: 542
Merged at revision: 543
Proposed branch: lp:~frank-heimes/installation-guide/ubuntu-18.04-sys-req-arch
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 330 lines (+76/-34)
7 files modified
en/hardware/hardware-supported.xml (+14/-9)
en/hardware/installation-media.xml (+19/-5)
en/hardware/network-cards.xml (+19/-8)
en/hardware/supported-peripherals.xml (+1/-1)
en/hardware/supported/s390.xml (+14/-4)
en/preparing/needed-info.xml (+7/-5)
en/welcome/what-is-ubuntu.xml (+2/-2)
To merge this branch: bzr merge lp:~frank-heimes/installation-guide/ubuntu-18.04-sys-req-arch
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2018-04-20 Approve on 2018-04-25
Review via email: mp+343719@code.launchpad.net

Commit message

Again s390x (IBM Z and LinuxONE) related changes to the ubuntu flavor.

Description of the change

Touched docs in sub-folders hardware, preparing and welcome.

Added some FIXMEs at places where I love to write different things for Debian and Ubuntu.
I only found an attribute Condition="not-ubuntu"
but no not-debian or ubuntu-only.
Any idea to realize that is appreciated.
For now I "wrote around" it ...

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'en/hardware/hardware-supported.xml'
2--- en/hardware/hardware-supported.xml 2016-01-26 07:14:43 +0000
3+++ en/hardware/hardware-supported.xml 2018-04-20 18:49:50 +0000
4@@ -11,8 +11,7 @@
5 <command>gcc</command>, etc. have been ported, and for which an &ubuntu;
6 port exists, can run &ubuntu;.
7 <phrase condition="not-ubuntu"> <!-- TODO: Debian-only at the moment -->
8-Please refer to the Ports pages at
9-<ulink url="&url-ports;"></ulink> for
10+Please refer to the Ports pages at <ulink url="&url-ports;"></ulink> for
11 more details on &arch-title; architecture systems which have been
12 tested with &debian-gnu;.
13 </phrase>
14@@ -117,7 +116,7 @@
15 <entry>5kc-malta</entry>
16 </row>
17
18-<row>
19+<row condition="not-ubuntu">
20 <entry>IBM/Motorola PowerPC</entry>
21 <entry>powerpc</entry>
22 <entry>PowerMac</entry>
23@@ -128,9 +127,9 @@
24 </row>
25
26 <row>
27- <entry>Power Systems</entry>
28+ <entry>IBM POWER Systems</entry>
29 <entry>ppc64el</entry>
30- <entry>IBM POWER8 or newer machines</entry>
31+ <entry>IBM POWER8 and newer machines</entry>
32 <entry></entry>
33 </row>
34
35@@ -154,22 +153,28 @@
36 </row>
37 -->
38
39-<row>
40+<row condition="not-ubuntu">
41 <entry>64bit IBM S/390</entry>
42 <entry>s390x</entry>
43 <entry>IPL from VM-reader and DASD</entry>
44 <entry>generic</entry>
45 </row>
46
47+<row> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
48+ <entry>IBM z/Architecture</entry>
49+ <entry>s390x</entry>
50+ <entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>
51+ <entry>zEC12 and newer machines</entry>
52+</row>
53+
54 </tbody></tgroup></informaltable>
55-
56 </para>
57
58 <para condition="not-ubuntu"> <!-- TODO: Debian-only at the moment -->
59
60 This document covers installation for the <emphasis>&arch-title;</emphasis>
61 architecture using the <emphasis>&arch-kernel;</emphasis> kernel.
62-If you are looking
63+If you are looking
64 for information on any of the other &debian;-supported architectures
65 take a look at the
66 <ulink url="http://www.debian.org/ports/">&debian;-Ports</ulink> pages.
67@@ -351,7 +356,7 @@
68 the release. Other hardware needs non-free drivers from 3rd parties.
69
70 </para>
71-<para>
72+<para arch="not-s390">
73 Details on supported graphics hardware and pointing devices can be found at
74 <ulink url="&url-xorg;"></ulink>. &debian; &release; ships
75 with X.Org version &x11ver;.
76
77=== modified file 'en/hardware/installation-media.xml'
78--- en/hardware/installation-media.xml 2015-12-19 21:18:18 +0000
79+++ en/hardware/installation-media.xml 2018-04-20 18:49:50 +0000
80@@ -28,7 +28,7 @@
81 </para>
82 </sect2>
83
84- <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM/BD-ROM</title>
85+ <sect2><title>CD-ROM/DVD-ROM/BD-ROM</title>
86
87 <note><para>
88
89@@ -36,7 +36,13 @@
90 all of CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies
91 are really the same from the operating system's point of view.
92
93-</para></note><para>
94+</para>
95+<para arch="s390">
96+
97+On IBM S/390 the CD-ROM / DVD-ROM drive of the Hardware Management Console (HMC) can be used for installations.
98+</para></note>
99+
100+<para>
101
102 CD-ROM based installation is supported for most architectures.
103
104@@ -79,8 +85,11 @@
105 particular netbooks and thin laptops, do not have a CD/DVD-ROM drive
106 anymore at all and booting from USB media is the standard way of
107 installing a new operating system on them.
108+</para>
109+<para arch="s390">
110+On IBM S/390 the USB drive of the Hardware Management Console (HMC) can be used for installations.
111+</para>
112
113-</para>
114 </sect2>
115
116 <sect2><title>Network</title>
117@@ -95,6 +104,10 @@
118 via either HTTP or FTP. After the installation is completed, you can also
119 configure your system to use ISDN and PPP.
120
121+</para><para arch="s390">
122+
123+On IBM S/390 network installations using FTP are the preferred and recommended installation technique.
124+
125 </para><para condition="supports-tftp">
126
127 You can also <emphasis>boot</emphasis> the installation system over the
128@@ -226,8 +239,9 @@
129 </para><para arch="s390">
130
131 Any storage system supported by the Linux kernel is also supported by
132-the boot system. This means that FBA and ECKD DASDs are supported with
133-the old Linux disk layout (ldl) and the new common S/390 disk layout (cdl).
134+the boot system. This means that FBA and ECKD DASDs are supported with
135+the old Linux disk layout (ldl) and the new common S/390 disk layout (cdl),
136+as well as FCP (SCSI over Fibre Channel).
137
138 </para>
139
140
141=== modified file 'en/hardware/network-cards.xml'
142--- en/hardware/network-cards.xml 2015-12-19 21:18:18 +0000
143+++ en/hardware/network-cards.xml 2018-04-20 18:49:50 +0000
144@@ -51,12 +51,18 @@
145 The list of supported network devices is:
146
147 <itemizedlist>
148- <listitem><para>
149-
150-Channel to Channel (CTC) and ESCON connection (real or emulated)
151-
152-</para></listitem>
153- <listitem><para>
154+<listitem><para>
155+
156+Channel to Channel (CTC)
157+
158+</para></listitem>
159+<listitem condition="not-ubuntu"><para>
160+
161+ESCON connection (real or emulated)
162+
163+</para></listitem>
164+
165+<listitem condition="not-ubuntu"><para>
166
167 OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)
168
169@@ -66,6 +72,11 @@
170 OSA-Express in QDIO mode, HiperSockets and Guest-LANs
171
172 </para></listitem>
173+<listitem><para> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
174+
175+RoCE Expresss, SMC-R adapter
176+
177+</para></listitem>
178 </itemizedlist>
179
180 </para>
181@@ -95,12 +106,12 @@
182 will prompt you to load firmware. See <xref linkend="loading-firmware"/>
183 for detailed information on how to load firmware during the installation.
184
185-</para><para>
186+</para><para arch="not-s390">
187
188 Wireless NICs that are not supported by the official &arch-kernel; kernel can generally
189 be made to work under &debian-gnu;, but are not supported during the installation.
190
191-</para><para>
192+</para><para arch="not-s390">
193
194 If there is a problem with wireless and there
195 is no other NIC you can use during the installation, it is still
196
197=== modified file 'en/hardware/supported-peripherals.xml'
198--- en/hardware/supported-peripherals.xml 2015-12-19 21:18:18 +0000
199+++ en/hardware/supported-peripherals.xml 2018-04-20 18:49:50 +0000
200@@ -22,7 +22,7 @@
201
202 Package installations from XPRAM and tape are not supported by this
203 system. All packages that you want to install need to be available on a
204-DASD or over the network using NFS, HTTP or FTP.
205+DASD, FCP LUN or over the network using HTTP or FTP (recommended).
206
207 </para>
208 </sect2>
209
210=== modified file 'en/hardware/supported/s390.xml'
211--- en/hardware/supported/s390.xml 2016-01-26 07:14:43 +0000
212+++ en/hardware/supported/s390.xml 2018-04-20 18:49:50 +0000
213@@ -1,8 +1,12 @@
214 <!-- retain these comments for translator revision tracking -->
215 <!-- $Id: s390.xml 70063 2015-11-01 15:36:53Z pkern $ -->
216
217-
218- <sect2 arch="s390"><title>zSeries and System z machine types</title>
219+ <sect2 arch="s390"><title>IBM Z and LinuxONE machine types</title>
220+<para>
221+The current product family name of the s390x architecture is IBM Z or the Linux-only variant IBM LinuxONE.
222+Older and in between outdated names like z Systems, System z or zSeries can still be found,
223+and the 64-bit IBM z/Architecture is sometimes still commonly referred to as S/390.
224+</para>
225 <para>
226
227 <phrase condition="not-ubuntu">Since &debian; Squeeze, support for booting in
228@@ -12,11 +16,17 @@
229 though. All zSeries and System z hardware is fully supported.
230 </phrase>
231
232+<!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
233+<phrase>For &ubuntu; the machine needs to support the z/Architecture,
234+so 64-bit support is mandatory, and the minimal architectural level for &ubuntu; support is
235+IBM Z EC12/BC12 or IBM LinuxONE Rockhopper/Emperor.
236+</phrase>
237+
238 &arch-title; support software is included from the kernel 4.2 development
239 stream. The most current information about IBM's Linux support can be found at
240 the
241 <ulink url="http://www.ibm.com/developerworks/linux/linux390/development_technical.html">
242-Linux on <trademark class="registered">System z</trademark> page on
243+Linux on <trademark class="registered">IBM Z and LinuxONE</trademark> page at
244 developerWorks</ulink>.
245
246 </para>
247@@ -25,7 +35,7 @@
248 <sect2 arch="s390"><title>PAV and HyperPAV</title>
249 <para>
250
251-PAV and HyperPAV are supported transparently, multipathing is not needed to
252+PAV and HyperPAV are supported transparently for DASD storage; multipathing is not needed to
253 take advantage of these storage system features. Be sure to configure the
254 devices during DASD device selection. The alias devices will not be
255 offered neither for formatting, partitioning nor direct use.
256
257=== modified file 'en/preparing/needed-info.xml'
258--- en/preparing/needed-info.xml 2015-12-19 21:18:18 +0000
259+++ en/preparing/needed-info.xml 2018-04-20 18:49:50 +0000
260@@ -88,7 +88,7 @@
261
262
263 Documentation of &arch-title;-specific boot sequence, commands and device
264-drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)
265+drivers (e.g. DASD, FCP, Console, OSA, HiperSockets and z/VM interaction)
266
267 </para>
268
269@@ -96,6 +96,8 @@
270 <listitem><para>
271
272 <ulink url="http://public.dhe.ibm.com/software/dw/linux390/docu/lk32dd04.pdf">Device Drivers, Features, and Commands (Linux Kernel 3.2)</ulink>
273+<ulink url="http://public.dhe.ibm.com/software/dw/linux390/docu/lux1dd00.pdf">Device Drivers, Features, and Commands on Ubuntu Server 16.04 LTS</ulink>
274+
275
276 </para></listitem>
277 </itemizedlist>
278@@ -340,13 +342,13 @@
279 The IDs are given inside the rightmost square brackets, i.e. here
280 10ec is the vendor- and 8168 is the product ID.
281
282-</para><para>
283+</para><para arch="not-s390">
284
285 As another example, a graphics card could give the following output:
286 <quote>04:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee
287 ATI RV710 [Radeon HD 4350] [1002:954f]</quote>.
288
289-</para><para>
290+</para><para arch="not-s390">
291
292 On Windows systems, the IDs for a device can be found in the Windows device
293 manager on the tab <quote>details</quote>, where the vendor ID is prefixed with VEN_
294@@ -356,7 +358,7 @@
295 device manager's details tab to actually see the IDs, as they are not
296 displayed by default.
297
298-</para><para>
299+</para><para arch="not-s390">
300
301 Searching on the internet with the vendor/product ID, <quote>&arch-kernel;</quote> and
302 <quote>driver</quote> as the search terms often results in information regarding
303@@ -462,7 +464,7 @@
304 because the DHCP server will provide it directly to your computer
305 during the installation process.
306
307-</para><para>
308+</para><para arch="not-s390">
309
310 If you have internet access via DSL or cable modem (i.e. over a cable tv
311 network) and have a router (often provided preconfigured by your phone or
312
313=== modified file 'en/welcome/what-is-ubuntu.xml'
314--- en/welcome/what-is-ubuntu.xml 2016-04-18 21:06:20 +0000
315+++ en/welcome/what-is-ubuntu.xml 2018-04-20 18:49:50 +0000
316@@ -46,12 +46,12 @@
317
318 Ubuntu is suitable for both desktop and server use. The current Ubuntu
319 release supports Intel x86 (IBM-compatible PC), AMD64 (x86-64), ARMv7,
320-ARMv8 (ARM64), IBM POWER8, IBM zSeries (zEC12/zEC13), and PowerPC
321+ARMv8 (ARM64), IBM POWER8 and IBM POWER9, IBM Z (zEC12/z13/z14) and IBM LinuxONE (Emperor/Rockhopper), and PowerPC
322 architectures.
323
324 </para><para>
325
326-Ubuntu includes more than 1000 pieces of software, starting with the Linux
327+Ubuntu includes thousands of pieces of software, starting with the Linux
328 kernel version &kernelversion; and GNOME &gnomeversion;, and covering every standard desktop
329 application from word processing and spreadsheet applications to internet
330 access applications, web server software, email software, programming

Subscribers

People subscribed via source and target branches

to all changes: