Fwd: [Merge] lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x-chapter_4_and_more into lp:~ubuntu-core-dev/installation-guide/ubuntu
Frank Heimes
frank.heimes at canonical.com
Sat Jun 9 02:01:27 UTC 2018
Hi and excuse me, but anyone form the 'Ubuntu Core Dev Team' able to review
the below MP for the inst guide?
---------- Forwarded message ----------
From: Frank Heimes <frank.heimes at canonical.com>
Date: Wed, Jun 6, 2018 at 11:38 PM
Subject: [Merge]
lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x-chapter_4_and_more
into lp:~ubuntu-core-dev/installation-guide/ubuntu
To: mp+347551 at code.launchpad.net
Frank Heimes has proposed merging lp:~frank-heimes/installation-
guide/ubuntu-18.04-s390x-chapter_4_and_more into lp:~ubuntu-core-dev/
installation-guide/ubuntu.
Commit message:
Did again various s390x-specific adjustments specially for Ubuntu on
several files that belog to the chapters 4 to 8 (incl.).
Requested reviews:
Ubuntu Core Development Team (ubuntu-core-dev)
For more details, see:
https://code.launchpad.net/~frank-heimes/installation-
guide/ubuntu-18.04-s390x-chapter_4_and_more/+merge/347551
Also added some URLs to urls.ent and things to common.ent; touched 32 files
in total.
Now only the appendices are left.
--
You are the owner of lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x-
chapter_4_and_more.
=== modified file 'build/entities/common.ent'
--- build/entities/common.ent 2018-04-24 23:38:46 +0000
+++ build/entities/common.ent 2018-06-06 21:37:38 +0000
@@ -10,6 +10,8 @@
<!-- we substitute Ubuntu's name here, so that we can reduce the number of
distinct places we have to patch the documentation. -->
<!ENTITY debian "Ubuntu">
+<!-- for special usage, like in files and folder names - a lower-case
variant of the above -->
+<!ENTITY debian-lc "ubuntu">
<!-- proper (long) name to use for Debian -->
<!ENTITY debian-gnu "&debian;">
@@ -18,6 +20,7 @@
<!ENTITY ubuntu "Ubuntu">
<!ENTITY d-i "<classname>debian-installer</classname>">
+<!ENTITY d-i-short "<classname>d-i</classname>">
<!ENTITY release "18.04">
<!ENTITY releasename "bionic">
=== modified file 'build/entities/urls.ent'
--- build/entities/urls.ent 2018-05-15 18:04:14 +0000
+++ build/entities/urls.ent 2018-06-06 21:37:38 +0000
@@ -40,6 +40,7 @@
<!ENTITY url-d-i-sataraid "&url-d-i-wiki;SataRaid">
<!ENTITY url-d-i-multipath "&url-d-i-wiki;MultipathSupport">
+<!ENTITY url-d-i-multipath-ubuntu "https://help.ubuntu.com/lts/
serverguide/dm-multipath-chapter.html">
<!ENTITY url-ports "http://&www-debian-org;/ports/&arch-porturl;/">
@@ -161,6 +162,7 @@
-->
<!ENTITY url-osd "http://opensource.org/osd">
<!ENTITY url-debian-wiki-software "http://&wiki-debian-org;/
DebianSoftware">
+<!ENTITY url-ubuntu-wiki-software "https://help.ubuntu.com/
community/Repositories">
<!-- GPL -->
<!ENTITY url-gnu-copyleft "http://www.gnu.org/licenses/
old-licenses/gpl-2.0.html">
=== modified file 'en/boot-installer/parameters.xml'
--- en/boot-installer/parameters.xml 2015-12-19 21:18:18 +0000
+++ en/boot-installer/parameters.xml 2018-06-06 21:37:38 +0000
@@ -94,7 +94,7 @@
</para><para>
-A number of parameters have a <quote>short form</quote> that helps avoid
+A number of parameters have a <quote>short form</quote> (or alias) that
helps avoid
the limitations of the kernel command line options and makes entering the
parameters easier. If a parameter has a short form, it will be listed in
brackets behind the (normal) long form. Examples in this manual will
@@ -124,6 +124,9 @@
(this is equivalent to the <emphasis>expert</emphasis> boot method).
With <userinput>priority=critical</userinput>, the installation system
will display only critical messages and try to do the right thing without
fuss.
+<note><para>In order to get asked for a VLAN configuration during the
network
+setup a priority of <userinput>medium</userinput> or
<userinput>low</userinput>
+is needed.</para></note>
</para></listitem>
</varlistentry>
@@ -150,7 +153,7 @@
The default frontend is <userinput>DEBIAN_FRONTEND=newt</userinput>.
<userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for
-serial console installs. Some specialized types of install media may
+serial console installs <phrase arch="s390">or on the &architecture;
platform when using the HMC task <quote>Operating System Messages</quote>
as console for LPARs or a 3215/3270 Terminal as console for z/VM
guests</phrase>. Some specialized types of install media may
only offer a limited selection of frontends, but the
<userinput>newt</userinput> and <userinput>text</userinput> frontends
are available on most default install media.
@@ -207,9 +210,10 @@
The value of the parameter is the path to the device to load the
&debian; installer from. For example,
-<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>
+<phrase arch="no-s390"><userinput>INSTALL_MEDIA_DEV=/dev/floppy/
0</userinput></phrase>
+<phrase arch="s390"><userinput>INSTALL_MEDIA_DEV=/dev/sdc1</
userinput></phrase>
-</para><para>
+</para><para arch="no-s390">
The boot floppy, which normally scans all floppies it can to find the
root floppy, can be overridden by this parameter to only look at the
@@ -313,7 +317,7 @@
</para></listitem>
</varlistentry>
-<varlistentry>
+<varlistentry arch="no-s390">
<term>hw-detect/start_pcmcia</term>
<listitem><para>
@@ -401,7 +405,7 @@
media used during the installation. This can be unnecessary if the system
does not automatically boot off the CD. In some cases it may even be
undesirable, for example if the optical drive cannot reinsert the media
-itself and the user is not there to do it manually. Many slot loading,
+itself and the user is not there (since working from remote) to do it
manually. Many slot loading,
slim-line, and caddy style drives cannot reload media automatically.
</para><para>
@@ -593,14 +597,14 @@
will also be propagated automatically to the configuration for the
installed
system.
-</para><para>
+</para><note><para>
-Note that it is now quite rare that parameters need to be passed to
modules.
+It became quite rare these days that parameters need to be passed to
modules.
In most cases the kernel will be able to probe the hardware present in a
system and set good defaults that way. However, in some situations it may
still be needed to set parameters manually.
-</para><para>
+</para></note><para>
The syntax to use to set parameters for modules is:
=== modified file 'en/boot-installer/s390.xml'
--- en/boot-installer/s390.xml 2015-12-19 21:18:18 +0000
+++ en/boot-installer/s390.xml 2018-06-06 21:37:38 +0000
@@ -1,34 +1,35 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id: s390.xml 68399 2012-12-06 10:49:53Z holger-guest $ -->
- <sect2 arch="s390"><title>s390 Limitations</title>
+ <sect2 arch="s390"><title>&arch-title; Limitations</title>
<para>
-In order to run the installation system a working network setup and
-ssh session is needed on S/390.
+In order to run the installation system on &architecture; a working
network setup is needed and
+a ssh session is recommended.
</para><para>
The booting process starts with a network setup that prompts you for
-several network parameters. If the setup is successful, you will login
+several network parameters. If the initial setup is successful, you will
usually login
to the system by starting an ssh session which will launch the
-standard installation system.
+standard installation system (alternatively you can proceed using the
console - however, this is less comfortable).
</para>
</sect2>
- <sect2 arch="s390"><title>s390 Boot Parameters</title>
+ <sect2 arch="s390"><title>&arch-title; Boot Parameters</title>
<para>
-On S/390 you can append boot parameters in the parm file. This file can
+On &architecture; you can append boot parameters in the parm file. This
file can
either be in ASCII or EBCDIC format. It needs to be fixed-width with
80 characters per line. A sample parm file
-<filename>parmfile.debian</filename> is provided with the installation
-images. If a parameter is too long to fit into the 80 characters limit
+<filename>parmfile.&debian-lc;</filename> is provided with the installation
+images, located in the <filename>./boot</filename> folder. If a parameter
is too long to fit into the 80 characters limit
it can simply be continued in the first column of the next line. All
the lines are concatenated without spaces when being passed to the
kernel.
+In total 11 lines (plus additonal 10 characters in the 12th line) can be
used.
<!-- Link is bad; commented out for now
Please read
@@ -39,7 +40,7 @@
</para><para>
If you boot the installer in a logical partition (LPAR) or
-virtual machine (VM) where a lot of devices are visible, you can
+virtual machine (z/VM) where a lot of devices are visible, you can
instruct the kernel to restrict the list to a fixed set of devices.
This is advised for the installer's boot process if a lot of disks are
visible, most likely in LPAR mode. The <quote>cio_ignore</quote> option
supports both
@@ -57,7 +58,7 @@
lower case. Furthermore if this boot parameter is used all devices
need to be listed: this includes at least disks, network devices and
the console. To be considered during the installer's boot process the
-above option needs to be added to <filename>parmfile.debian</filename>.
+above option needs to be added to <filename>parmfile.&debian-lc;
</filename>.
</para>
</sect2>
=== modified file 'en/boot-installer/trouble.xml'
--- en/boot-installer/trouble.xml 2015-12-19 21:18:18 +0000
+++ en/boot-installer/trouble.xml 2018-06-06 21:37:38 +0000
@@ -277,7 +277,7 @@
If you have problems and the kernel hangs during the boot process,
doesn't recognize peripherals you actually have, or drives are not
recognized properly, the first thing to check is the boot parameters,
-as discussed in <xref linkend="boot-parms"/>.
+as discussed in <xref linkend="boot-parms"/><phrase arch="s390">,
including a potential and maybe faulty use of cio_ignore</phrase>.
</para>
@@ -513,7 +513,7 @@
If you get through the initial boot phase but cannot complete the install,
the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful.
It lets you store system error logs and configuration information from the
-installer to a floppy, or download them using a web browser.
+installer to a disk <phrase arch="not-s390x">or a removable media, like
floppy or USB drive, </phrase>or download them using a web browser.
This information may provide clues as to what went wrong and how to
fix it. If you are submitting a bug report, you may want to attach
@@ -538,18 +538,18 @@
successful, so that we can get as much information as possible on the
largest
number of hardware configurations.
-</para><para>
+</para><note condition="not-ubuntu"><para>
-Note that your installation report will be published in the Debian Bug
+Your installation report will be published in the Debian Bug
Tracking System (BTS) and forwarded to a public mailing list. Make sure
that
you use an e-mail address that you do not mind being made public.
-</para><para>
+</para></note><para>
If you have a working &debian; system, the easiest way to send an
installation
report is to install the <classname>installation-report</classname> and
<classname>reportbug</classname> packages
-(<command>aptitude install installation-report reportbug</command>),
+(<command>apt install installation-report reportbug</command>),
configure <classname>reportbug</classname> as explained in
<xref linkend="mail-outgoing"/>, and run the command <command>reportbug
installation-reports</command>.
@@ -567,7 +567,7 @@
Image version: <Full URL to image you downloaded is best>
Date: <Date and time of the install>
-Machine: <Description of machine (eg, IBM Thinkpad R32)>
+Machine: <Description of machine (eg, IBM Thinkpad W520)>
Processor:
Memory:
Partitions: <df -Tl will do; the raw partition table is preferred>
=== modified file 'en/boot-new/boot-new.xml'
--- en/boot-new/boot-new.xml 2016-04-18 21:54:24 +0000
+++ en/boot-new/boot-new.xml 2018-06-06 21:37:38 +0000
@@ -204,6 +204,30 @@
and then two tabs.
</para>
+<para>
+Even the usual login screen shows lot's of useful information regarding
documentation, support, basic system information and last login data:
+<informalexample role="example"><screen>
+Welcome to Ubuntu 18.04 LTS (GNU/Linux 4.15.0-22-generic s390x)
+
+ * Documentation: https://help.ubuntu.com
+ * Management: https://landscape.canonical.com
+ * Support: https://ubuntu.com/advantage
+
+ System information as of Tue Jun 5 17:17:17 EDT 2018
+
+ System load: 0.01 Processes: 180
+ Usage of /home: 0.2% of 20.18GB Users logged in: 1
+ Memory usage: 4% IP address for encc000: 169.254.232.169
+ Swap usage: 0% IP address for virbr0: 192.168.122.1
+
+
+0 packages can be updated.
+0 updates are security updates.
+
+Last login: Tue Jun 5 17:46:34 2018 from 10.177.178.179
+</screen></informalexample>
+</para>
</sect1>
</chapter>
+
=== modified file 'en/hardware/hardware-supported.xml'
--- en/hardware/hardware-supported.xml 2018-05-15 18:04:14 +0000
+++ en/hardware/hardware-supported.xml 2018-06-06 21:37:38 +0000
@@ -127,9 +127,9 @@
</row>
<row>
- <entry>IBM POWER</entry>
+ <entry>IBM POWER Systems</entry>
<entry>ppc64el</entry>
- <entry>IBM POWER8 and newer systems</entry>
+ <entry>IBM POWER8 and newer machines</entry>
<entry></entry>
</row>
@@ -164,7 +164,7 @@
<entry>IBM z/Architecture</entry>
<entry>s390x</entry>
<entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>
- <entry>zEC12 and newer systems</entry>
+ <entry>zEC12 and newer machines</entry>
</row>
</tbody></tgroup></informaltable>
=== modified file 'en/install-methods/automatic-install.xml'
--- en/install-methods/automatic-install.xml 2015-12-19 21:18:18 +0000
+++ en/install-methods/automatic-install.xml 2018-06-06 21:37:38 +0000
@@ -5,7 +5,7 @@
<title>Automatic Installation</title>
<para>
-For installing on multiple computers it's possible to do fully
+For unattended installs on multiple computers it's possible to do fully
automatic installations using the &debian; Installer itself.
</para>
@@ -80,8 +80,8 @@
To place a Kickstart file on a CD, you would need to remaster the ISO image
to include your Kickstart file, and add ks=cdrom:/path/to/ks.cfg to the
kernel boot parameters. See the manual page for mkisofs for details.
-Alternatively, put the Kickstart file on a floppy, and add
-ks=floppy:/path/to/ks.cfg to the kernel boot parameters.
+<phrase condition="not-s390"> Alternatively, put the Kickstart file on a
floppy, and add
+ks=floppy:/path/to/ks.cfg to the kernel boot parameters.</phrase>
</para>
@@ -191,7 +191,7 @@
<filename>nscd</filename>.
</para></listitem>
-<listitem><para>
+<listitem condition="not-s390"><para>
The <userinput>bootloader --linear</userinput>,
<userinput>--nolinear</userinput>, and <userinput>--lba32</userinput>
@@ -231,7 +231,7 @@
Installation from an archive on a local hard disk or from an NFS archive.
</para></listitem>
-<listitem><para>
+<listitem condition="not-s390"><para>
The <userinput>lilocheck</userinput> command to check for an existing LILO
installation.
@@ -263,13 +263,13 @@
RAID configuration.
</para></listitem>
-<listitem><para>
+<listitem condition="not-s390"><para>
The <userinput>xconfig --monitor</userinput> option to use a specified
monitor name.
</para></listitem>
-<listitem><para>
+<listitem condition="not-s390"><para>
Most package groups. As special cases, the "Ubuntu Desktop" and "Kubuntu
Desktop" groups install the standard Ubuntu or Kubuntu desktop systems
@@ -346,6 +346,8 @@
#Installation media
cdrom
#nfs --server=server.com --dir=/path/to/ubuntu/
+#url --url http://server.com/path/to/ubuntu/
+#url --url ftp://server.com/path/to/ubuntu/
#System bootloader configuration
bootloader --location=mbr
=== modified file 'en/install-methods/official-cdrom.xml'
--- en/install-methods/official-cdrom.xml 2015-12-19 21:18:18 +0000
+++ en/install-methods/official-cdrom.xml 2018-06-06 21:37:38 +0000
@@ -6,24 +6,29 @@
<para>
By far the easiest way to install &ubuntu; is from an
-<ulink url="&url-ubuntu-releases;">Official &ubuntu; CD-ROM</ulink>.
+<phrase arch="not-s390"><ulink url="&url-ubuntu-releases;">Official
&ubuntu; CD-ROM</ulink></phrase>
+<phrase arch="s390"><ulink url="&url-ubuntu-download-s390x;">Official
&ubuntu; CD-ROM image</ulink></phrase>.
You may download the CD-ROM image from an &ubuntu; mirror and make
your own CD, if you have a fast network connection and a CD burner.
-If you have an &ubuntu; CD and CDs are
-bootable on your machine<phrase arch="x86">, which is the case on all
-modern PCs</phrase>, you can skip right to
+If you have an &ubuntu; CD and CDs are bootable on your machine
+<phrase arch="x86">, which is the case on all modern PCs</phrase>
+<phrase arch="s390">(on &architecture; this is doable via the HMC task
+<quote>Load from Removable Media</quote>)</phrase>, you can skip right to
<xref linkend="boot-installer"/>; much effort has been expended to ensure
the files most people need are there on the CD.
</para><para>
If your machine doesn't support CD booting<phrase arch="x86"> (only
relevant
-on very old PC systems)</phrase>, but you do have a CD,
+on very old PC systems)</phrase><phrase arch="s390"> or if you do not have
the proper privileges
+</phrase>, but you do have a CD or an ISO image,
you can use an alternative strategy such as
<phrase condition="supports-floppy-boot">floppy disk,</phrase>
-<phrase arch="s390">VM reader,</phrase>
+<phrase arch="s390">network install using HMC's <quote>Load from Removable
Media</quote> task and selecting <quote>FTP source</quote>,</phrase>
+
+<phrase arch="s390">z/VM reader,</phrase>
<phrase condition="bootable-disk">hard disk,</phrase>
@@ -46,9 +51,9 @@
</para><para>
If you don't have a CD, then you will need to download the
-installer system files and place them on the
+installer system files and place them on a
-<phrase arch="s390">VM minidisk</phrase>
+<phrase arch="s390">z/VM minidisk or a connected computer that acts as
network install server</phrase>
<phrase condition="supports-floppy-boot">floppy disk or</phrase>
@@ -56,9 +61,7 @@
<phrase condition="bootable-usb">usb stick or</phrase>
-<phrase condition="supports-tftp">a connected computer</phrase>
-
-so they can be used to boot the installer.
+<phrase condition="supports-tftp">a connected computer</phrase>, so they
can be used to find and boot the installer.
</para>
=== modified file 'en/partitioning/sizing.xml'
--- en/partitioning/sizing.xml 2015-12-19 21:18:18 +0000
+++ en/partitioning/sizing.xml 2018-06-06 21:37:38 +0000
@@ -10,11 +10,12 @@
have a single partition containing the entire operating system,
applications, and your personal files. Most people feel that a
separate swap partition is also a necessity, although it's not
-strictly true. <quote>Swap</quote> is scratch space for an operating
system,
+strictly true. <phrase><!-- FIXME: nothing like condition="not-debian" or
condition="ubuntu-only" supported, yet -->In fact, since Ubuntu 18.04 a
swap file rather than a swap partition is now used by default.</phrase>
+<quote>Swap</quote> is scratch space for an operating system,
which allows the system to use disk storage as <quote>virtual
memory</quote>. By putting swap on a separate partition, &arch-kernel; can
make much
-more efficient use of it. It is possible to force &arch-kernel; to use a
-regular file as swap, but it is not recommended.
+more efficient use of it. <!-- the following no longer applies to Ubuntu
18.04 - see above --> <!-->It is possible to force &arch-kernel; to use a
+regular file as swap, but it is not recommended.</-->
</para><para>
=== modified file 'en/post-install/kernel-baking.xml'
--- en/post-install/kernel-baking.xml 2015-12-19 21:18:18 +0000
+++ en/post-install/kernel-baking.xml 2018-06-06 21:37:38 +0000
@@ -57,7 +57,7 @@
To compile a kernel the Debian/Ubuntu way, you need some packages:
<classname>fakeroot</classname>, <classname>kernel-package</classname>,
-<classname>linux-source-2.6</classname>
+<classname>linux-source<!-- -2.6 --></classname>
and a few others which are probably already installed (see
<filename>/usr/share/doc/kernel-package/README.gz</filename> for the
complete list).
@@ -76,7 +76,7 @@
the <quote>Debian/Ubuntu way</quote>; but we find that using the packaging
system
to manage your kernel is actually safer and easier. In fact, you can get
your kernel sources right from Linus instead of
-<classname>linux-source-2.6</classname>,
+<classname>linux-source<!-- -2.6 --></classname>,
yet still use the <classname>kernel-package</classname> compilation method.
</para><para>
=== modified file 'en/post-install/mail-setup.xml'
--- en/post-install/mail-setup.xml 2015-12-19 21:18:18 +0000
+++ en/post-install/mail-setup.xml 2018-06-06 21:37:38 +0000
@@ -33,7 +33,7 @@
often used in combination with <command>exim</command> or
<command>sendmail</command> as MTA and <command>procmail</command> as MDA.
-</para><para>
+</para><para condition="supports-desktop">
With the increasing popularity of graphical desktop systems, the use of
graphical e-mail programs like GNOME's <command>evolution</command>,
=== modified file 'en/post-install/orientation.xml'
--- en/post-install/orientation.xml 2015-12-19 21:18:18 +0000
+++ en/post-install/orientation.xml 2018-06-06 21:37:38 +0000
@@ -54,19 +54,24 @@
For instance, if you replace <filename>/usr/bin/perl</filename>, that
will work, but then if you upgrade your <classname>perl</classname>
package, the file you put there will be replaced. Experts can get
-around this by putting packages on <quote>hold</quote> in
-<command>aptitude</command>.
+around this by putting packages on <quote>hold</quote> using
+<command>aptitude</command> or <command>apt-mark</command>.
</para><para>
One of the best installation methods is apt. You can use the command
-line version <command>apt-get</command>, the full-screen text version
+line versions <command>apt</command> and <command>apt-get</command>, the
full-screen text version
<application>aptitude</application>, or the graphical version
-<application>synaptic</application>. Note apt will also let you merge
+<application>synaptic</application>.
+
+</para>
+
+<note><para>
+apt will also let you merge
main, contrib, and non-free so you can have export-restricted packages
as well as standard versions.
+</para></note>
-</para>
</sect2>
<sect2><title>Additional Software Available for &debian;</title>
@@ -76,8 +81,7 @@
enabled in the default &debian; install. These contain software which
many find important and expect to have. Information on these
additional repositories can be found on the &debian; Wiki page titled
-<ulink url="&url-debian-wiki-software;">The Software
-Available for &debian;'s Stable Release</ulink>.
+<ulink url="&url-ubuntu-wiki-software;">&debian; documentation -
Repositories</ulink>.
</para>
</sect2>
=== modified file 'en/post-install/rescue.xml'
--- en/post-install/rescue.xml 2015-12-19 21:18:18 +0000
+++ en/post-install/rescue.xml 2018-06-06 21:37:38 +0000
@@ -13,7 +13,7 @@
have a system to work from while you fix it, and rescue mode can be useful
for this.
-</para><para>
+</para><para arch="not-s390">
<!-- TODO: describe what to do on arches where this isn't set up in the
bootloader -->
@@ -30,7 +30,47 @@
network devices, and so on are available to you while repairing your
system.
-</para><para>
+</para><para arch="s390">
+
+There are two options to rescue a broken &debian; on &architecture; system:
+
+</para><para arch="s390">
+
+First of all the zipl boot menu usually offers an option to boot an
<guimenuitem>old</guimenuitem> kernel via the boot option number
<guimenuitem>2</guimenuitem>.
+<informalexample role="example"><screen>
+zIPL v2.3.0-build-20180425 interactive boot menu
+
+ 0. default (ubuntu)
+
+ 1. ubuntu
+ 2. old
+Please choose (default will boot in 10 seconds):
+</screen></informalexample>
+Boot problems are often introduced by a kernel change.
+So there is a good chance that the prior / old kernel will still work.
+
+</para><para arch="s390">
+
+The second option is to boot an installation kernel and select from the
inital screen the <guimenuitem>Start shell</guimenuitem> entry.
+<informalexample role="example"><screen>
+ ┌────────────────────────┤ [!!] Configuring d-i
├─────────────────────────┐
+ │
│
+ │ This is the network console for the Debian installer. From here, you
│
+ │ may start the Debian installer, or execute an interactive shell.
│
+ │
│
+ │ To return to this menu, you will need to log in again.
│
+ │
│
+ │ Network console option:
│
+ │
│
+ │ Start installer
│
+ │ Start installer (expert mode)
│
+ │ Start shell
│
+ │
│
+ └───────────────────────────────────────────────────────────
──────────────┘
+</screen></informalexample>
+The functionality in the &d-i; shell is limited, however, it can still act
as a rescue system to fix a broken installation.
+
+</para><para arch="not-s390">
Instead of the partitioning tool, you should now be presented with a list
of
the partitions on your system, and asked to select one of them. Normally,
@@ -38,7 +78,7 @@
need to repair. You may select partitions on RAID and LVM devices as well
as
those created directly on disks.
-</para><para>
+</para><para arch="not-s390">
If possible, the installer will now present you with a shell prompt in the
file system you selected, which you can use to perform any necessary
@@ -50,7 +90,7 @@
<userinput>grub-install '(hd0)'</userinput> to do so.
</phrase>
-</para><para>
+</para><para arch="not-s390">
If the installer cannot run a usable shell in the root file system you
selected, perhaps because the file system is corrupt, then it will issue a
@@ -59,7 +99,7 @@
often be enough to repair your system anyway. The root file system you
selected will be mounted on the <filename>/target</filename> directory.
-</para><para>
+</para><para arch="not-s390">
In either case, after you exit the shell, the system will reboot.
=== modified file 'en/post-install/shutdown.xml'
--- en/post-install/shutdown.xml 2016-06-10 22:15:00 +0000
+++ en/post-install/shutdown.xml 2018-06-06 21:37:38 +0000
@@ -5,8 +5,7 @@
<sect1 id="shutdown">
<title>Shutting down the system</title>
-<para>
-
+<para arch="not-s390">
To shut down a running &debian-gnu; system, you must not reboot with the
reset switch on the front or back of your computer, or just turn off
the computer. &debian-gnu; should be shut down in a controlled manner,
@@ -15,9 +14,14 @@
desktop environment, there is usually an option to <quote>log out</quote>
available from the application menu that allows you to shutdown (or reboot)
the system.</phrase>
-
-</para><para>
-
+</para>
+
+<para arch="s390">
+To shut down a &debian-gnu; system on &architecture; in a controlled way
you need to use of the commands <command>reboot</command>,
<command>poweroff</command> and <command>shutdown</command> (that all point
to <command>systemctl</command>) or <command>halt</command>, since you
usually work on &debian-gnu; systems from remote using a ssh connection.
+&debian-gnu; systems running in LPAR can also be stopped using the HMC, as
well as &debian-gnu; systems running on z/VM with a CMS command like
<command>force</command>, but all this is usually less graceful than using
one of the above Linux commands.
+</para>
+
+<para arch="not-s390">
Alternatively you can press the key combination <keycombo>
<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
<phrase arch="powerpc"> or <keycombo> <keycap>Control</keycap>
@@ -25,23 +29,22 @@
systems</phrase>.
If the key combinations do not work, a last option is to log in as root
and type the necessary commands.
-Use <command>reboot</command> to reboot the system.
-Use <command>halt</command> to halt the system without powering it off
+</para>
+
+<para arch="s390">
+Be careful using a key combination like <keycombo><keycap>Ctrl</keycap>
<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> to shutdown or reboot
a remote system, because this key combination may have an effect on your
local workstation rather than the remote system.
+</para>
+<para>
+Just use <command>reboot</command> to reboot the system and
<command>halt</command> to halt the system without powering it off
<footnote>
-
<para>
Under the SysV init system <command>halt</command> had the same
effect as <command>poweroff</command>, but with systemd as init
- system (the default in jessie) their effects are different.
+ system <phrase condition="not-ubuntu">(the default in jessie)</phrase>
their effects are different.
</para>
-
</footnote>.
-To power off the machine, use <command>poweroff</command>
-or <command>shutdown -h now</command>.
-The systemd init system provides additional commands that perform
-the same functions; for example <command>systemctl reboot</command>
-or <command>systemctl poweroff</command>.
-
-
+To power off the machine, use <command>poweroff</command> or
<command>shutdown -h now</command>.
+The systemd init system provides additional commands that perform the same
functions; for example <command>systemctl reboot</command> or
<command>systemctl poweroff</command>.
</para>
+
</sect1>
=== modified file 'en/preparing/non-debian-partitioning.xml'
--- en/preparing/non-debian-partitioning.xml 2018-05-15 18:04:14 +0000
+++ en/preparing/non-debian-partitioning.xml 2018-06-06 21:37:38 +0000
@@ -35,7 +35,7 @@
At the very least you will need a dedicated partition for the &debian;
root filesystem.
<note><para arch="s390">
-Please notice that it's quite unusal (but not impossible) on
&architecture; to use different partitions of one disk for different
operating systems. The operating system boundary is usually an entire disk
or mini disk rather than a partition.
+Please notice that it's quite unusual on &architecture; to use different
partitions of one disk for different operating systems. However, the
operating system boundary is usually an entire disk or mini disk rather
than a partition.
</para></note>
</para><para>
=== modified file 'en/preparing/pre-install-bios-setup.xml'
--- en/preparing/pre-install-bios-setup.xml 2018-05-15 18:04:14 +0000
+++ en/preparing/pre-install-bios-setup.xml 2018-06-06 21:37:38 +0000
@@ -10,7 +10,7 @@
Generally, this involves checking and possibly changing BIOS/system
firmware settings for
your system. The <quote>BIOS</quote> or <quote>system firmware</quote> is
the core software used by the
hardware; it is most critically invoked during the bootstrap process
(after power-up).
-<phrase arch="s390">On &architecture; access to the firware realized by
the Handware Management Console (HMC) and the Support Element (SE). For
LPAR installations HMC access is sufficient.</phrase>
+<phrase arch="s390">On &architecture; access to the firmware realized by
the Handware Management Console (HMC) and the Support Element (SE). For
LPAR installations HMC access is sufficient.</phrase>
</para>
=== modified file 'en/using-d-i/components.xml'
--- en/using-d-i/components.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/components.xml 2018-06-06 21:37:38 +0000
@@ -121,7 +121,7 @@
At this point you have a usable but limited system.
Most users will want to install additional software on the system to tune
it to
-their needs, and the installer allows you do so. This step can take even
+their needs, and the installer allows you to do so. This step can take even
longer than installing the base system if you have a slow computer or
network connection.
=== modified file 'en/using-d-i/modules/apt-setup.xml'
--- en/using-d-i/modules/apt-setup.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/apt-setup.xml 2018-06-06 21:37:38 +0000
@@ -6,16 +6,16 @@
<para>
-One of the tools used to install packages on a &debian-gnu; system is
-a program called <command>apt-get</command>, from the
+Some of the tools used to install packages on a &debian-gnu; system are
+the programs called <command>apt-get</command> or just
<command>apt</command>, from the
<classname>apt</classname> package<footnote>
<para>
Note that the program which actually installs the packages is called
-<command>dpkg</command>. However, this program is more of a low-level
-tool. <command>apt-get</command> is a higher-level tool, which will
-invoke <command>dpkg</command> as appropriate. It knows how to retrieve
-packages from your CD, the network, or wherever. It is also able to
+<command>dpkg</command>. However, this program is more of a low-level
+tool. <command>apt-get</command> and <command>apt</command> are
higher-level tools, which will
+invoke <command>dpkg</command> as appropriate. They know how to retrieve
+packages from your CD, the network, or wherever. They are also able to
automatically install other packages which are required to make the
package you're trying to install work correctly.
</para>
@@ -29,7 +29,8 @@
</para><para>
-<command>apt</command> must be configured so that it knows from where to
+The <command>apt</command> and <command>apt-get</command> front-end
+must be configured so that it knows from where to
retrieve packages. The results of this configuration are written to the
file <filename>/etc/apt/sources.list</filename>. You can examine and edit
this file to your liking after the installation is complete.
@@ -53,7 +54,7 @@
</para>
- <sect4 id="apt-setup-cdset">
+ <sect4 id="apt-setup-cdset"> <!-- Is this section about CDs/DVDs
'sets' still relevant these days (especially to Ubuntu) ... -->
<title>Installing from more than one CD or DVD</title>
<para>
@@ -113,16 +114,16 @@
If you are <emphasis>not</emphasis> installing from a full CD or DVD or
using a full CD/DVD image, you really should use a network mirror as
-otherwise you will end up with only a very minimal system. However, if you
-have a limited Internet connection it is best <emphasis>not</emphasis>
-to select the <literal>desktop</literal> task in the next step of the
-installation.
+otherwise you will end up with only a very minimal system.
+<phrase arch="not-s390">However, if you have a limited Internet connection
+it is best <emphasis>not</emphasis> to select the
<literal>desktop</literal>
+task in the next step of the installation.</phrase>
</para><para>
If you are installing from a single full CD or using a full CD image, using
a network mirror is not required, but is still strongly recommended because
-a single CD contains only a fairly limited number of packages.
+a single CD or image contains only a fairly limited number of packages.
If you have a limited Internet connection it may still be best
to <emphasis>not</emphasis> select a network mirror here, but to finish the
installation using only what's available on the CD and selectively install
@@ -200,9 +201,9 @@
A mirror can also be specified by hand by choosing <quote>enter information
manually</quote> . You can then specify a mirror host name and an optional
-port number. As of Wheezy, that actually has to be a URL base, i.e. when
+port number.<phrase condition="not-ubuntu"> As of Wheezy, that actually
has to be a URL base, i.e. when
specifying an IPv6 address, one has to add square brackets around it, for
-instance <quote>[2001:db8::1]</quote>.
+instance <quote>[2001:db8::1]</quote>.</phrase>
</para><para condition="not-ubuntu">
=== modified file 'en/using-d-i/modules/base-installer.xml'
--- en/using-d-i/modules/base-installer.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/base-installer.xml 2018-06-06 21:37:38 +0000
@@ -3,18 +3,28 @@
<para>
-During installation of the base system, package unpacking and setup
+<phrase arch="not-s390">During installation of the base system, package
unpacking and setup
messages are redirected to <userinput>tty4</userinput>.
You can access this terminal by pressing
<keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>;
get back to the main installer process with
-<keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
+<keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.</phrase>
+<phrase arch="s390">
+During installation of the base system, package unpacking and setup
+messages are redirected to log files located in
<filename>/var/log/</filename>.
+You can access these log files by selecting <guimenuitem>Execute a
shell</guimenuitem> at the &d-i;
+main menu that runs in the console or (and this is recommended)
+by starting just another &d-i; ssh session and selecting
<guimenuitem>Execute a shell</guimenuitem> there.
+Inside of such a &d-i; shell the log files are directly accessible.
+Alternatively the logs can also be remotely accessed and stored with the
help of the
+<guimenuitem>Save debug logs</guimenuitem> &d-i; main menu entry.
+</phrase>
</para><para>
The unpack/setup messages generated during this phase are also saved in
<filename>/var/log/syslog</filename>. You can check them there if the
-installation is performed over a serial console.
+installation is performed over a <phrase arch="not-s390">serial</phrase>
console.
</para><para>
=== modified file 'en/using-d-i/modules/clock-setup.xml'
--- en/using-d-i/modules/clock-setup.xml 2009-11-20 16:12:49 +0000
+++ en/using-d-i/modules/clock-setup.xml 2018-06-06 21:37:38 +0000
@@ -15,7 +15,7 @@
</para><para arch="s390">
-The installer does not modify the system clock on the s390 platform.
+The installer does not modify the system clock on the &architecture;
platform.
</para>
=== modified file 'en/using-d-i/modules/finish-install.xml'
--- en/using-d-i/modules/finish-install.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/finish-install.xml 2018-06-06 21:37:38 +0000
@@ -12,10 +12,8 @@
</para><para arch="s390">
-After a final prompt the system will be halted because rebooting is not
-supported on &arch-title;.
-You then need to IPL &debian-gnu; from the DASD which you selected for the
-root filesystem during the first steps of the installation.
+After a final prompt the system will be rebooted and the machine will
perform an IPL (Initial Program Load).
+The installed system will come up from the DASD or FCP LUN where the root
filesystem is located on.
</para>
</sect3>
=== modified file 'en/using-d-i/modules/iso-scan.xml'
--- en/using-d-i/modules/iso-scan.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/iso-scan.xml 2018-06-06 21:37:38 +0000
@@ -1,7 +1,7 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id: iso-scan.xml 64916 2010-10-08 22:15:00Z holger-guest $ -->
- <sect3 id="iso-scan">
+ <sect3 id="iso-scan"> <!-- FIXME: adding arch="not-s390" ? -->
<title>Looking for the &debian; Installer ISO Image</title>
<para>
=== modified file 'en/using-d-i/modules/lowmem.xml'
--- en/using-d-i/modules/lowmem.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/lowmem.xml 2018-06-06 21:37:38 +0000
@@ -42,7 +42,7 @@
Despite these measures, it is still possible that your system freezes,
that unexpected errors occur or that processes are killed by the kernel
because the system runs out of memory (which will result in <quote>Out
-of memory</quote> messages on VT4 and in the syslog).
+of memory</quote> messages <phrase arch="not-s390">on VT4 and</phrase> in
the syslog).
</para><para>
=== modified file 'en/using-d-i/modules/netcfg.xml'
--- en/using-d-i/modules/netcfg.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/netcfg.xml 2018-06-06 21:37:38 +0000
@@ -26,7 +26,7 @@
fails, that may be caused by many factors ranging from an
unplugged network cable to missing infrastructure for automatic
configuration. For further explanation in case of errors, check
-the error messages on the fourth console. In any case, you will
+the error messages on the <phrase arch="not-s390">fourth
</phrase>console. In any case, you will
be asked if you want to retry, or if you want to perform a manual
setup. Sometimes the network services used for autoconfiguration
can be slow in their responses, so if you are sure everything is
@@ -46,12 +46,13 @@
<computeroutput>IP address</computeroutput>,
<computeroutput>Netmask</computeroutput>,
<computeroutput>Gateway</computeroutput>,
-<computeroutput>Name server addresses</computeroutput>, and a
-<computeroutput>Hostname</computeroutput>.
-Moreover, if you have a wireless network interface, you will be asked
+<computeroutput>Name server addresses</computeroutput>,
+<computeroutput>Hostname</computeroutput>, and a
+<computeroutput>Domain name</computeroutput>.
+<phrase arch="not-s390">Moreover, if you have a wireless network
interface, you will be asked
to provide your <computeroutput>Wireless ESSID</computeroutput>
(<quote>wireless network name</quote>) and a <computeroutput>WEP
key</computeroutput> or
-<computeroutput>WPA/WPA2 passphrase</computeroutput>.
+<computeroutput>WPA/WPA2 passphrase</computeroutput>.</phrase>
Fill in the answers from
<xref linkend="needed-info"/>.
@@ -63,8 +64,7 @@
the bitwise OR of your system's IP address with the bitwise negation of
the netmask. It will also guess your gateway. If you can't find any of
these answers, use the offered defaults — if necessary, you can
-change them by editing <filename>/etc/network/interfaces</filename> once
-the system has been installed.
+change them by editing <filename>/etc/netplan/01-netcfg.yaml</filename>
(or <filename>/etc/network/interfaces</filename> - in case you switched
from netplan to ifupdown) once the system has been installed.
</para></note>
</sect4>
=== modified file 'en/using-d-i/modules/network-console.xml'
--- en/using-d-i/modules/network-console.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/network-console.xml 2018-06-06 21:37:38 +0000
@@ -35,12 +35,12 @@
</para><para>
<phrase arch="not-s390">After selecting this new entry, you</phrase>
-<phrase arch="s390">You</phrase> will be asked for a new password
+<phrase arch="s390">You</phrase> will be asked for a temporary password
to be used for connecting to the installation system and for its
confirmation. That's all. Now you should see a screen which instructs
you to login remotely as the user <emphasis>installer</emphasis> with
the password you just provided. Another important detail to notice on
-this screen is the fingerprint of this system. You need to transfer
+this screen is the fingerprint of this system. You need to transfer
the fingerprint securely to the person who will continue the
installation remotely.
@@ -102,14 +102,11 @@
to such host. The reason is that it will have different fingerprint, which
is usually a sign of a spoofing attack. If you are sure this is not the
case, you will need to delete the relevant line from
-<filename>~/.ssh/known_hosts</filename><footnote>
-
-<para>
+<filename>~/.ssh/known_hosts</filename>
+<footnote><para>
The following command will remove an existing entry for a host:
<command>ssh-keygen -R <<replaceable>hostname</
replaceable>|<replaceable>IP address</replaceable>></command>.
-</para>
-
-</footnote> and try again.
+</para></footnote> and try again.
</para></note><para>
=== modified file 'en/using-d-i/modules/partman-crypto.xml'
--- en/using-d-i/modules/partman-crypto.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/partman-crypto.xml 2018-06-06 21:37:38 +0000
@@ -35,7 +35,7 @@
Please note that the performance of encrypted partitions will be
less than that of unencrypted ones because the data needs to be
decrypted or encrypted for every read or write. The performance impact
-depends on your CPU speed, chosen cipher and a key length.
+depends on your CPU speed, chosen cipher, the key length and whether you
use hardware assisted cryptography operations or not<phrase arch="s390">
(like supported by CPACF, the Central Processor Assist for Cryptographic
Function feature, or the CryptoExpress adapter cards)</phrase>.
</para></note><para>
=== modified file 'en/using-d-i/modules/partman.xml'
--- en/using-d-i/modules/partman.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/partman.xml 2018-06-06 21:37:38 +0000
@@ -76,9 +76,11 @@
<ulink url="&url-d-i-sataraid;">our Wiki</ulink>.
</para></listitem>
<listitem><para>
- <emphasis>Multipath</emphasis> (experimental)
- </para><para>
- See <ulink url="&url-d-i-multipath;">our Wiki</ulink> for information.
+ <emphasis>Multipath</emphasis><!-- FIXME: no, not really experimental
anymore ?! --> <!--> (experimental) </-->
+ </para><para condition="not-ubuntu">
+ See <ulink url="&url-d-i-multipath;">our Wiki</ulink> for
information.</para><para>
+ <!-- FIXME: nothing like condition="not-debian" or
condition="ubuntu-only" supported, yet -->
+ See <ulink url="&url-d-i-multipath-ubuntu;">our Wiki</ulink> for
information.</para><para>
Support for multipath is currently only available if enabled when the
installer is booted.
</para></listitem>
@@ -110,7 +112,7 @@
<listitem arch="linux-any"><para>
<emphasis>xfs</emphasis> (not available on all architectures)
</para></listitem>
- <listitem arch="kfreebsd-any"><para>
+ <listitem arch="kfreebsd-any"><para> <!-- FIXME: ZFS is included and
supported by Ubuntu since 16.04 - but not by d-i yet -->
<emphasis>zfs</emphasis>
</para><para>
As ZFS support in the installer is still in development, only a basic
@@ -160,7 +162,7 @@
mount points for them. It is not possible to create new qnx4
partitions.
</para></listitem>
<listitem><para>
- <emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>
+ <emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis> <!-- FIXME:
What about exFAT? Shouldn't it be listed here, too? -->
</para></listitem>
<listitem arch="x86;ia64"><para>
<emphasis>NTFS</emphasis> (read-only)
@@ -330,9 +332,9 @@
This example shows two hard drives divided into several partitions;
the first disk has some free space. Each partition line consists of
the partition number, its type, size, optional flags, file system, and
-mountpoint (if any). Note: this particular setup cannot be created
+mountpoint (if any).<note>This particular setup cannot be created
using guided partitioning but it does show possible variation that can
-be achieved using manual partitioning.
+be achieved using manual partitioning.</note>
</para><para>
@@ -342,7 +344,7 @@
implement the new partition table (as described at the end of this
section). If you are not happy, you can choose to <guimenuitem>Undo
changes to partitions</guimenuitem> and run guided partitioning again, or
-modify the proposed changes as described below for manual partitioning.
+modify the proposed changes as described below for <guimenuitem>Manual
Partitioning</guimenuitem>.
</para>
</sect3>
@@ -395,14 +397,13 @@
that may not be very obvious at a first glance is that you can
resize the partition by selecting the item displaying the size of the
partition. Filesystems known to work are at least fat16, fat32, ext2,
-ext3 and swap. This menu also allows you to delete a partition.
+ext3, ext4 and swap. This menu also allows you to delete a partition.
</para><para>
-Be sure to create at least two partitions: one for the
-<emphasis>root</emphasis> filesystem (which must be mounted as
-<filename>/</filename>) and one for <emphasis>swap</emphasis>. If you
-forget to mount the root filesystem, <command>partman</command> won't
+Be sure to create at least one partition for the <emphasis>root</emphasis>
filesystem (which must be mounted as
+<filename>/</filename>) and possibly another one for
<emphasis>swap</emphasis> - in case you dislike going with a swap file.
+If you forget to mount the root filesystem, <command>partman</command>
won't
let you continue until you correct this issue.
</para><para arch="amd64;arm64;i386">
=== modified file 'en/using-d-i/modules/pkgsel.xml'
--- en/using-d-i/modules/pkgsel.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/pkgsel.xml 2018-06-06 21:37:38 +0000
@@ -20,17 +20,17 @@
So, you have the ability to choose <emphasis>tasks</emphasis> first,
and then add on more individual packages later. These tasks loosely
represent a number of different jobs or things you want to do with
-your computer, such as <quote>Desktop environment</quote>,
-<quote>Web server</quote>, or <quote>Print server</quote><footnote>
+your computer, such as <phrase arch="not-s390"><quote>Desktop
environment</quote>, </phrase>
+<quote>Mail server</quote>, <quote>Web server</quote>, or <quote>Print
server</quote><footnote>
<para>
You should know that to present this list, the installer is merely
invoking the <command>tasksel</command> program. It can be run at any
time after installation to install more packages (or remove them), or
-you can use a more fine-grained tool such as <command>aptitude</command>.
+you can use more fine-grained tools like <command>aptitude</command>,
<command>apt-get</command> or <command>apt</command>.
If you are looking for a specific single package, after
-installation is complete, simply run <userinput>aptitude install
+installation is complete, simply run <userinput>apt install
<replaceable>package</replaceable></userinput>, where
<replaceable>package</replaceable> is the name of the package you are
looking for.
@@ -46,6 +46,13 @@
computer you are installing. If you disagree with these selections you can
deselect them. You can even opt to install no tasks at all at this point.
+</para><para arch="s390">
+
+In case the installer has a hard requirements on certain packages, like on
+&architecture; where openssh is needed for the second installation stage,
+the installer will automatically install what's required - whether the
+<guimenuitem>OpenSSH server</guimenuitem> task is selected to not.
+
</para>
<tip><para>
@@ -97,8 +104,8 @@
localization tasks are defined for that locale and will automatically try
to install relevant localization packages. This includes for example
packages containing word lists or special fonts for your language.
-If a desktop environment was selected, it will also install appropriate
-localization packages for that (if available).
+<phrase arch="not-s390">If a desktop environment was selected, it will
also install appropriate
+localization packages for that (if available).</phrase>
</para><para>
@@ -109,7 +116,7 @@
</para><para>
-You should be aware that especially the Desktop task is very large.
+<phrase arch="not-s390">You should be aware that especially the Desktop
task is very large.</phrase>
Especially when installing from a normal CD-ROM in combination with a
mirror for packages not on the CD-ROM, the installer may want to retrieve
a lot of packages over the network. If you have a relatively slow
=== modified file 'en/using-d-i/modules/save-logs.xml'
--- en/using-d-i/modules/save-logs.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/save-logs.xml 2018-06-06 21:37:38 +0000
@@ -14,8 +14,8 @@
</para><para>
Choosing <guimenuitem>Save debug logs</guimenuitem> from the main
-menu allows you to save the log files to a floppy disk, network, hard
-disk, or other media. This can be useful if you encounter fatal problems
+menu allows you to save the log files to a <phrase arch="not-s390">floppy
disk, </phrase>network, hard
+disk, or other (removable) media. This can be useful if you encounter
fatal problems
during the installation and wish to study the logs on another system
or attach them to an installation report.
=== modified file 'en/using-d-i/modules/shell.xml'
--- en/using-d-i/modules/shell.xml 2008-10-06 23:03:54 +0000
+++ en/using-d-i/modules/shell.xml 2018-06-06 21:37:38 +0000
@@ -4,7 +4,7 @@
<sect3 id="shell">
<title>Using the Shell and Viewing the Logs</title>
-<para>
+<para arch="not-s390">
There are several methods you can use to get a shell while running an
installation. On most systems, and if you are not installing over
@@ -12,7 +12,7 @@
<emphasis>virtual console</emphasis> by pressing <keycombo><keycap>Left
Alt</keycap> <keycap>F2</keycap></keycombo><footnote>
-<para>
+<para arch="not-s390">
That is: press the <keycap>Alt</keycap> key on the left-hand side of the
<keycap>space bar</keycap> and the <keycap>F2</keycap> function key
at the same time.
@@ -28,10 +28,12 @@
</para><para>
-If you cannot switch consoles, there is also an <guimenuitem>Execute
+In case switching consoles is not an option, there is also an
<guimenuitem>Execute
a Shell</guimenuitem> item on the main menu that can be used to start
a shell. You can get to the main menu from most dialogs by using the
-&BTN-GOBACK; button one or more times. Type <userinput>exit</userinput>
+&BTN-GOBACK; button one or more times. Alternatively you can also open an
additional
+ssh installer session and execute the <guimenuitem>Execute
+a Shell</guimenuitem> there - see next chapter. Type
<userinput>exit</userinput>
to close the shell and return to the installer.
</para><para>
=== modified file 'en/using-d-i/using-d-i.xml'
--- en/using-d-i/using-d-i.xml 2015-12-19 21:18:18 +0000
+++ en/using-d-i/using-d-i.xml 2018-06-06 21:37:38 +0000
@@ -8,7 +8,7 @@
<para>
The &debian; Installer (based on the Debian Installer, and so often called
-simply &d-i;) consists of a number of special-purpose
+simply &d-i; or just &d-i-short;) consists of a number of special-purpose
components to perform each installation task. Each component performs
its task, asking the user questions as necessary to do its job.
The questions themselves are given priorities, and the priority
@@ -95,6 +95,7 @@
<keycap>Pg-Down</keycap> to scroll the list in sections. The
<keycap>space bar</keycap> selects an item such as a checkbox. Use
&enterkey; to activate choices.
+<phrase arch="s390">Sometimes default values are provided that can be
accepted by entering a single <quote>.</quote> (dot).</phrase>
</para><para>
@@ -107,7 +108,7 @@
S/390 does not support virtual consoles. You may open a second and third
ssh session to view the logs described below.
-</para><para>
+</para><para arch="not-s390">
Error messages and logs are redirected to the fourth console.
You can access this console by
@@ -119,7 +120,7 @@
</para><para>
-These messages can also be found in
+The error messages are logged in
<filename>/var/log/syslog</filename>. After installation, this log
is copied to <filename>/var/log/installer/syslog</filename> on your
new system. Other installation messages may be found in
@@ -189,10 +190,31 @@
the question priority may be downgraded temporarily to allow you
to resolve the problem, and in that case the menu may appear.
+<informalexample role="example" arch="s390"><screen>
+Ubuntu installer main menu
+--------------------------
+
+Choose the next step in the install process:
+ 1: Configure the network device [*],
+ 2: Configure the network,
+ 3: Continue installation remotely using SSH,
+ 4: Choose language,
+ 5: Choose a mirror of the Ubuntu archive,
+ 6: Download installer components,
+ 7: Change debconf priority,
+ 8: Save debug logs,
+ 9: Execute a shell,
+ 10: Abort the installation,
+Prompt: '?' for help, default=1>
+</screen></informalexample>
+
</para><para>
-You can get to the main menu by selecting the &BTN-GOBACK; button
-repeatedly to back all the way out of the currently running component.
+<phrase arch="not-s390">You can get to the main menu by selecting the
+&BTN-GOBACK; button repeatedly to back all the way out of the currently
+running component.</phrase>
+<phrase arch="s390">The main menu can be reached by using the less-than key
+<quote><</quote> </phrase>.
</para></listitem>
</varlistentry>
@@ -222,7 +244,7 @@
<term>hw-detect</term><listitem><para>
Automatically detects most of the system's hardware, including network
-cards, disk drives, and PCMCIA.
+cards<phrase arch="not-s390">, PCMCIA</phrase> and disk drives.
</para></listitem>
</varlistentry>
@@ -320,8 +342,9 @@
Allows the user to partition disks attached to the system, create file
systems on the selected partitions, and attach them to the
mountpoints. Included are also interesting features like a fully
-automatic mode or LVM support. This is the preferred partitioning tool
-in &debian;.
+automatic mode or LVM support. <phrase arch="s390">It also has full support
+for the &architecture;-specific storage devices DASD and FCP.</phrase>
+This is the preferred partitioning tool in &debian;.
</para></listitem>
</varlistentry>
@@ -408,7 +431,8 @@
The various bootloader installers each install a boot loader program on the
hard disk, which is necessary for the computer to start up using
&arch-kernel;
-without using a floppy or CD-ROM. Many boot loaders allow the user to
+without requiring further (removable) media<phrase arch="not-s390">, like
floppy or CD-ROM</phrase>.
+Many boot loaders allow the user to
choose an alternate operating system each time the computer boots.
</para></listitem>
@@ -426,8 +450,8 @@
<term>save-logs</term><listitem><para>
-Provides a way for the user to record information on a floppy disk,
network,
-hard disk, or other media when trouble is encountered, in order to
accurately
+Provides a way for the user to record information on a hard disk<phrase
arch="not-s390">, floppy disk</phrase>, network,
+or other (removable) media when trouble is encountered, in order to
accurately
report installer software problems to &debian; developers later.
</para></listitem>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20180609/8e162c66/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 58923 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20180609/8e162c66/attachment-0001.diff>
More information about the Ubuntu-reviews
mailing list