Merge lp:~fheimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more into lp:~ubuntu-core-dev/installation-guide/ubuntu

[Frank Heimes]

Adjusted and expanded info on IBM Z aka s390x starting with rescue,recovery mode up to the entire appendix;
especially preseed and debootstrap;
fixed some nested xml element usage, that prevents building pdfs under special circumstances
this also solves LP 1564788

worked on, updated and expanded:
- modified docstruct, to add s390x specific disk storage
- 8.7. Recovering a Broken System - en/post-install/rescue.xml - added rescue more for s390x!
- fixed <note> element usage issues
           ~/work/installationguide/ubuntu-18.04-s390x-appendices_and_more$ ./build/buildone.sh amd64 en "html pdf"
           openjade:build.tmp/install.en.profiled.xml:2371:6:E: end tag for "note" which is not finished
           openjade:build.tmp/install.en.profiled.xml:2371:6:E: end tag for "note" which is not finished
           Error: build of pdf failed with error code 1
           Warning: The following formats failed to build: pdf
- figured out that nested <para> is not a good idea - html generation accepts that, but not tex,dvi,pdf
          hard to find a bad nesting situation that happend while including one docbook file into another:
          disk-storage.xml including dasd.xml and fcp.xml
- A. Installation Howto - installation-howto.xml
- A.1. Booting the installer
- A.2. Installation
- A.3. And finally…
- B.1. Introduction
- B.2. Using preseeding - ./en/appendix/preseed.xml
- B.3. Creating a preconfiguration file (no change)
- 2.1.6. Disk Storage (complete new sub-chapter)
          ./en/hardware/hardware-supported.xml --> reference and add: &disk-storage.xml; --> ./build/templates/docstruct.ent
          /en/hardware$ cp supported-peripherals.xml disk-storage.xml
          fheimes@T570:~/work/installationguide/ubuntu-18.04-s390x-appendices_and_more$ bzr add ./en/hardware/disk-storage.xml
          adding en/hardware/disk-storage.xml
          What about the other translations ? They pull-in en if no translation is available.
- ./en/using-d-i/modules/s390/dasd.xml - is empty --> content added (incl. partition limits)
          fheimes@T570:~/work/installationguide/ubuntu-18.04-s390x-appendices_and_more$ bzr add ./en/using-d-i/modules/s390/dasd.xml
   done - ./en/using-d-i/modules/s390/fcp.xml - is missing --> file created and content added (incl. partition limits)
          fheimes@T570:~/work/installationguide/ubuntu-18.04-s390x-appendices_and_more$ bzr add ./en/using-d-i/modules/s390/fcp.xml
          adding en/using-d-i/modules/s390/fcp.xml
- Adding a separate s390x preseed example ?
- B.4. Contents of the preconfiguration file (for bionic)
- B.5. Advanced options
- Appendix C. Partitioning for Ubuntu
- C.1. Deciding on Ubuntu Partitions and Sizes
- C.2. The Directory Tree
- C.3. Recommended Partitioning Scheme
- C.4. Device Names in Linux - device-names.xml
- C.5. Ubuntu Partitioning Programs
- Appendix D. Random Bits
- D.1. Linux Devices
- D.2. Disk Space Needed for Tasks
- D.3. Disk Space Needed
- D.4. Installing Ubuntu from a Unix/Linux System
- nothing todo on: Appendix E. Administrivia and the rest

=== modified file 'build/entities/common.ent'
--- build/entities/common.ent	2018-06-06 21:26:51 +0000
+++ build/entities/common.ent	2018-06-21 13:42:34 +0000
@@ -88,6 +88,8 @@
 <!-- Size of the basic installation -->
   <!ENTITY base-system-size   "506">
   <!ENTITY std-system-size    "822">
+  <!ENTITY base-system-size-s390x   "1064">   <!-- no idea where the above numbers come from, hence I defined a separate entity with my measurements for s390x -->
+  <!ENTITY std-system-size-s390x    "1343">   <!-- no idea where the above numbers come from, hence I defined a separate entity with my measurements for s390x -->
 <!-- Desktop environment task - GNOME -->
   <!ENTITY task-desktop-gnome-inst "2487">
   <!ENTITY task-desktop-gnome-dl    "765">

=== modified file 'build/templates/docstruct.ent'
--- build/templates/docstruct.ent	2015-12-19 21:18:18 +0000
+++ build/templates/docstruct.ent	2018-06-21 13:42:34 +0000
@@ -30,8 +30,9 @@
    <!ENTITY supported-powerpc.xml        SYSTEM "##SRCPATH##/hardware/supported/powerpc.xml">
    <!ENTITY supported-s390.xml           SYSTEM "##SRCPATH##/hardware/supported/s390.xml">
    <!ENTITY supported-sparc.xml          SYSTEM "##SRCPATH##/hardware/supported/sparc.xml">
-  <!ENTITY network-cards.xml            SYSTEM "##SRCPATH##/hardware/network-cards.xml">
-  <!ENTITY supported-peripherals.xml    SYSTEM "##SRCPATH##/hardware/supported-peripherals.xml">
+   <!ENTITY network-cards.xml            SYSTEM "##SRCPATH##/hardware/network-cards.xml">
+   <!ENTITY disk-storage.xml             SYSTEM "##SRCPATH##/hardware/disk-storage.xml">
+   <!ENTITY supported-peripherals.xml    SYSTEM "##SRCPATH##/hardware/supported-peripherals.xml">
   <!ENTITY accessibility-hardware.xml   SYSTEM "##SRCPATH##/hardware/accessibility.xml">
   <!ENTITY buying-hardware.xml          SYSTEM "##SRCPATH##/hardware/buying-hardware.xml">
   <!ENTITY installation-media.xml       SYSTEM "##SRCPATH##/hardware/installation-media.xml">
@@ -94,12 +95,13 @@
   <!ENTITY boot-installer-accessibility.xml   SYSTEM "##SRCPATH##/boot-installer/accessibility.xml">
   <!ENTITY boot-installer-trouble.xml      SYSTEM "##SRCPATH##/boot-installer/trouble.xml">
 
- <!ENTITY using-d-i.xml                  SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml">
+  <!ENTITY using-d-i.xml                  SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml">
   <!ENTITY using-d-i-components.xml      SYSTEM "##SRCPATH##/using-d-i/components.xml">
 
   <!ENTITY module-localechooser.xml      SYSTEM "##SRCPATH##/using-d-i/modules/localechooser.xml">
   <!ENTITY module-s390-netdevice.xml     SYSTEM "##SRCPATH##/using-d-i/modules/s390/netdevice.xml">
   <!ENTITY module-s390-dasd.xml          SYSTEM "##SRCPATH##/using-d-i/modules/s390/dasd.xml">
+  <!ENTITY module-s390-fcp.xml           SYSTEM "##SRCPATH##/using-d-i/modules/s390/fcp.xml">
   <!ENTITY module-ddetect.xml            SYSTEM "##SRCPATH##/using-d-i/modules/ddetect.xml">
   <!ENTITY module-kbd-chooser.xml        SYSTEM "##SRCPATH##/using-d-i/modules/kbd-chooser.xml">
   <!ENTITY module-netcfg.xml             SYSTEM "##SRCPATH##/using-d-i/modules/netcfg.xml">

=== modified file 'doc/cheatsheet.xml'
--- doc/cheatsheet.xml	2015-12-19 21:18:18 +0000
+++ doc/cheatsheet.xml	2018-06-21 13:42:34 +0000
@@ -145,6 +145,14 @@
 A paragraph only interesting for Linux/arm64 users.                           
 </para>
 
+<para arch="s390">
+A paragraph only interesting for Linux/s390 users.                           
+</para>
+
+<para arch="not-s390">
+A paragraph not interesting for Linux/s390 users.                           
+</para>
+
 <sect3 condition="bootable-from-hard-disk">
 A section pertaining only to computers which
 can boot from their hard disk.

=== modified file 'en/appendix/chroot-install.xml'
--- en/appendix/chroot-install.xml	2016-04-18 21:37:25 +0000
+++ en/appendix/chroot-install.xml	2018-06-21 13:42:34 +0000
@@ -74,6 +74,8 @@
 # swapon /dev/<replaceable>sda5</replaceable>
 </screen></informalexample>
 
+<note><para>Instead of using a dedicated swap partition, you may omit the swap partition setup here and later just use a swap file instead.</para></note>
+
 Mount one partition as <filename>/mnt/ubuntu</filename> (the
 installation point, to be the root (<filename>/</filename>) filesystem
 on your new system). The mount point name is strictly arbitrary, it is
@@ -113,6 +115,7 @@
 </footnote>. Install <command>wget</command> and
 <command>ar</command> if they aren't already on your current system,
 then download and install <command>debootstrap</command>.
+If these steps are executed under &debian; you can simply do this by <userinput>apt install debootstrap</userinput>.
 
 </para>
 
@@ -209,7 +212,56 @@
 Depending on the value of TERM, you may have to install the
 <classname>ncurses-term</classname> package to get support for it.
 
-</para>
+<note><para>
+If warnings occur like:
+<informalexample><screen>
+bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+</screen></informalexample>
+The required localization files need to be generated:
+<informalexample><screen>
+# sudo locale-gen en_US.UTF-8
+Generating locales (this might take a while)...
+  en_US.UTF-8... done
+Generation complete.
+</screen></informalexample>
+</para></note>
+
+</para>
+
+   <sect3>
+   <title>Configure Apt</title>
+<para>
+
+Debootstrap will have created a very basic <filename>/etc/apt/sources.list</filename> that will allow installing
+additional packages. However, it is suggested that you add some additional sources,
+for example for source packages and security updates:
+</para><para>
+<informalexample><screen>
+deb-src http://archive.ubuntu.com/ubuntu &releasename; main
+
+deb http://security.ubuntu.com/ubuntu &releasename;-security main
+deb-src http://security.ubuntu.com/ubuntu &releasename;-security main
+</screen></informalexample>
+</para><para>
+Make sure to run <userinput>apt update</userinput> after you have
+made changes to the sources list.
+
+</para>
+   </sect3>
+
+
+   <sect3>
+   <title>Install additional packages</title>
+<para>
+
+Now it's required to install some additionally required packages, like makedev (needed for the next section):
+<userinput>apt install makedev</userinput>
+
+</para><para arch="s390">
+Or in case using the &architecture; architecture the mandatory s390-tools package: <userinput>apt install s390-tools</userinput>
+
+</para>
+   </sect3>
 
    <sect3>
    <title>Create device files</title>
@@ -230,13 +282,14 @@
 <itemizedlist>
 <listitem><para>
 
-install the makedev package, and create a default set of static device files
-using (after chrooting)
+create a default set of static device files using (after chrooting)
 <informalexample><screen>
-# apt-get install makedev
 # mount none /proc -t proc
 # cd /dev
 # MAKEDEV generic
+or depending on your specific architecture:
+# MAKEDEV std
+# cd ..
 </screen></informalexample>
 
 </para></listitem>
@@ -244,12 +297,72 @@
 
 manually create only specific device files using <command>MAKEDEV</command>
 
+</para><para arch="s390">
+On &architecture; the DASD devices need to be created this way:
+<informalexample><screen>
+# cd /dev
+# MAKEDEV dasd
+# cd ..
+</screen></informalexample>
+
 </para></listitem>
+<!-- this is an alternate method to create DASD devices -->
+<!-- <listitem arch="s390"><para>
+
+If using DASD devices a manual creation of the device node(s) might be needed.
+For this the major/minor device number of the DASD that is going to be used is needed (for DASDs the major number is always 94):
+Find this out on your host system with:
+<informalexample><screen>
+$ cat /proc/dasd/devices | grep dasdb
+0.0.260b(ECKD) at ( 94:    12) is dasdb       : active at blocksize: 4096, 1803060 blocks, 7043 MB
+</screen></informalexample>
+
+With that the device nodes and partitions entries can be created:
+<informalexample><screen>
+# mknod -m 660 /dev/dasdb b 94 12 
+# mknod -m 660 /dev/dasdb1 b 94 12
+# ls -l /dev/dasd*
+brw-rw - - - - 1 root root 94, 12 Jun 20 04:45 /dev/dasdb
+brw-rw - - - - 1 root root 94, 12 Jun 20 04:46 /dev/dasdb1
+</screen></informalexample>
+
+It's recommended to do a quick check if the partition is accessible by:
+<informalexample><screen>
+# fdasd -ps /dev/dasdb
+          /dev/dasdb1          2   150254   150253    1  Linux native
+</screen></informalexample>
+</para></listitem> -->
+
 <listitem><para>
 
-bind mount /dev from your host system on top of /dev in the target system;
-note that the postinst scripts of some packages may try to create device
-files, so this option should only be used with care
+bind mount /dev from your host system on top of /dev in the target system, like:
+<informalexample><screen>
+mount --bind dev /dev
+</screen></informalexample>
+Note that the postinst scripts of some packages may try to create device files,
+so this option should only be used with care.
+
+</para></listitem>
+<listitem arch="s390"><para>
+mount proc and sysfs
+</para><para>
+You can mount the proc and sysfs file systems multiple times and to arbitrary
+locations, though <filename>/proc</filename> and <filename>/sys</filename> respectively are customary.
+
+<informalexample><screen>
+# mount -t proc proc /proc
+# mount -t sysfs sysfs /sys
+</screen></informalexample>
+
+</para><para>
+
+The command <userinput>ls /proc</userinput> should now show a non-empty
+directory. Should this fail, you may be able to mount proc from outside
+the chroot:
+
+<informalexample><screen>
+# mount -t proc proc /mnt/ubuntu/proc
+</screen></informalexample>
 
 </para></listitem>
 </itemizedlist>
@@ -257,6 +370,37 @@
 </para>
    </sect3>
 
+   <sect3 arch="s390">
+   <title>DASD Disks and Partitions</title>
+<para>
+Even if <command>lsdasd</command> already lists DASD devices:
+<informalexample><screen>
+# lsdasd
+Bus-ID     Status      Name      Device  Type  BlkSz  Size      Blocks
+==============================================================================
+0.0.1601   active      dasda     94:0    ECKD  4096   7043MB    1803060
+0.0.260a   active      dasdb     94:4    ECKD  4096   7043MB    1803060
+</screen></informalexample>
+...they - and other CCW devices like DASD, FCP oder QETH devices as well - cannot be fully and persistently used, yet.
+<informalexample><screen>
+# lszdev --online | head -n 1 &amp;&amp; lszdev --online | grep dasd-eckd
+TYPE       ID                                              ON   PERS  NAMES
+dasd-eckd  0.0.0123                                        yes  no    dasda
+dasd-eckd  0.0.1234                                        yes  no    dasdb
+</screen></informalexample>
+Here DASD 1234 is the one used for debootstrap.
+Now make this particular DASD persistently active with the help of the usual <command>chzdev</command> tool:
+<informalexample><screen>
+# chzdev -e 1234
+ECKD DASD 0.0.1234 configured
+# lszdev --online 1234            
+TYPE       ID        ON   PERS  NAMES
+dasd-eckd  0.0.1234  yes  yes   dasdb
+</screen></informalexample>
+Repeat similar steps for other CCW devices, like FCP, QETH devices or further DASD devices - if needed.
+</para>
+   </sect3>
+
    <sect3>
    <title>Mount Partitions</title>
 <para>
@@ -269,7 +413,7 @@
 
 Here is a sample you can modify to suit:
 
-<informalexample><screen>
+<informalexample arch="not-s390"><screen>
 # /etc/fstab: static file system information.
 #
 # file system    mount point   type    options                  dump pass
@@ -289,6 +433,17 @@
 /dev/XXX         /home         ext3    rw,nosuid,nodev          0    2
 </screen></informalexample>
 
+<informalexample arch="s390"><screen>
+# /etc/fstab: static file system information.
+# hand-crafted
+# file system    mount point   type    options                  dump pass
+#
+/dev/dasdb1      /             ext4    defaults                 0    1
+
+/swapfile        none          swap    sw                       0    0
+</screen></informalexample>
+
+
 Use <userinput>mount -a</userinput> to mount all the file systems you
 have specified in your <filename>/etc/fstab</filename>, or, to mount
 file systems individually, use:
@@ -309,6 +464,8 @@
 # ln -s media/cdrom
 </screen></informalexample>
 
+</para><para arch="not-s390">
+
 You can mount the proc and sysfs file systems multiple times and to arbitrary
 locations, though <filename>/proc</filename> and <filename>/sys</filename> respectively are customary. If you didn't use
 <userinput>mount -a</userinput>, be sure to mount proc and sysfs before continuing:
@@ -365,7 +522,7 @@
 <para>
 
 To configure networking, edit
-<filename>/etc/network/interfaces</filename>,
+<filename>/etc/network/interfaces</filename>, <!-- FIXME: may need to be adapted to netplan for Ubuntu -->
 <filename>/etc/resolv.conf</filename>,
 <filename>/etc/hostname</filename> and
 <filename>/etc/hosts</filename>.
@@ -450,28 +607,6 @@
    </sect3>
 
    <sect3>
-   <title>Configure Apt</title>
-<para>
-
-Debootstrap will have created a very basic
-<filename>/etc/apt/sources.list</filename> that will allow installing
-additional packages. However, it is suggested that you add some additional sources,
-for example for source packages and security updates:
-
-<informalexample><screen>
-deb-src http://archive.ubuntu.com/ubuntu &releasename; main
-
-deb http://security.ubuntu.com/ubuntu &releasename;-security main
-deb-src http://security.ubuntu.com/ubuntu &releasename;-security main
-</screen></informalexample>
-
-Make sure to run <userinput>aptitude update</userinput> after you have
-made changes to the sources list.
-
-</para>
-   </sect3>
-
-   <sect3>
    <title>Configure Locales and Keyboard</title>
 <para>
 
@@ -480,13 +615,13 @@
 Currently the use of UTF-8 locales is recommended.
 
 <informalexample><screen>
-# aptitude install language-pack-de language-pack-gnome-de
+# apt install language-pack-de language-pack-gnome-de
 </screen></informalexample>
 
 To configure your keyboard (if needed):
 
 <informalexample><screen>
-# aptitude install console-setup
+# apt install console-setup
 # dpkg-reconfigure keyboard-configuration 
 </screen></informalexample>
 
@@ -515,8 +650,9 @@
 Then install the kernel package of your choice using its package name.
 
 <informalexample><screen>
-# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>
+# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>
 </screen></informalexample>
+(You may want install <filename>linux-image-generic</filename>, too.)
 
 </para>
   </sect2>
@@ -528,7 +664,7 @@
 To make your &debian-gnu; system bootable, set up your boot loader to load
 the installed kernel with your new root partition. Note that
 <command>debootstrap</command> does not install a boot loader, though you
-can use <command>aptitude</command> inside your &debian; chroot to do so.
+can use <command>apt</command> inside your &debian; chroot to do so.
 
 </para><para arch="any-x86">
 
@@ -552,7 +688,7 @@
 Installing and setting up <classname>grub2</classname> is as easy as:
 
 <informalexample><screen>
-# aptitude install grub-pc
+# apt install grub-pc
 # grub-install /dev/<replaceable>sda</replaceable>
 # update-grub
 </screen></informalexample>
@@ -561,7 +697,7 @@
 the MBR of <literal>sda</literal>). The last command will create a sane
 and working <filename>/boot/grub/grub.cfg</filename>.
 
-</para><para>
+</para><para arch="not-s390">
 
 Note that this assumes that a <filename>/dev/sda</filename> device file has
 been created. There are alternative methods to install <command>grub2</command>,
@@ -610,6 +746,55 @@
 On some machines, you may need to use <userinput>ide0:</userinput>
 instead of <userinput>hd:</userinput>.
 
+</para><para arch="s390">
+The <quote>zipl</quote> bootloader is part of the <quote>s390-tools</quote> package that was installed earlier.
+Check <userinput>man zipl.conf</userinput> for instructions on setting up the bootloader.
+Either create a <filename>zipl.conf</filename> configuration from scratch or copy over and modify the existing one.
+
+</para><para arch="s390">
+
+Here is a basic <filename>/etc/zipl.conf</filename> as an example:
+
+<informalexample><screen>
+[defaultboot]
+defaultmenu = menu
+
+:menu
+target = /boot
+1 = ubuntu
+default = 1
+
+[ubuntu]
+target = /boot
+image = /boot/vmlinuz
+ramdisk = /boot/initrd.img
+parameters = root=/dev/dasdb1
+</screen></informalexample>
+
+Since the <filename>kernel</filename> and <filename>initrd</filename> filesnames in <filename>/boot</filename> are versioned,
+it's recommended to link them to non-versioned default names, like:
+<informalexample><screen>
+# ln -s /boot/vmlinuz-4.15.0-23-generic /boot/vmlinuz
+# ln -s /boot/initrd.img-4.15.0-23-generic /boot/initrd.img
+
+# ls -la /boot/vmlinuz* /boot/initrd.img*
+lrwxrwxrwx 1 root root       28 Jun 20 07:31 /boot/initrd.img -> initrd.img-&lt;version&gt;-generic
+-rw-r--r-- 1 root root 11245088 Jun 20 07:14 /boot/initrd.img-&lt;version&gt;-generic
+lrwxrwxrwx 1 root root       25 Jun 20 07:31 /boot/vmlinuz -> vmlinuz-&lt;version&gt;-generic
+-rw------- 1 root root  4390912 May 23 12:54 /boot/vmlinuz-&lt;version&gt;-generic
+</screen></informalexample>
+
+Finally don't forget to execute the <command>zipl</command> command for writing the configuration to disk:
+<informalexample><screen>
+# zipl 
+Using config file '/etc/zipl.conf'
+Building bootmap in '/boot'
+Building menu 'menu'
+Adding #1: IPL section 'ubuntu' (default)
+Preparing boot device: dasdb (&lt;your dasd device number&gt;).
+Done.
+</screen></informalexample>
+
 </para>
   </sect2>
 
@@ -622,10 +807,9 @@
 SSH and set up access.
 
 <informalexample><screen>
-# aptitude install ssh
+# apt install openssh-server <!-- FIXME: was formerly 'ssh' - no condition available to limit text to ubuntu-only or not-debian -->
 </screen></informalexample>
 
-
 Root login with password is disabled by default, so setting up access can be
 done by setting a password and re-enable root login with password:
 
@@ -667,10 +851,11 @@
 to install all packages with <quote>standard</quote> priority:
 
 <informalexample><screen>
+# apt install tasksel
 # tasksel install standard
 </screen></informalexample>
 
-Of course, you can also just use <command>aptitude</command> to install
+Of course, you can also just use <command>apt</command> to install
 packages individually.
 
 </para><para>
@@ -680,7 +865,7 @@
 diskspace by running:
 
 <informalexample><screen>
-# aptitude clean
+# apt clean
 </screen></informalexample>
 
 </para>

=== modified file 'en/appendix/files.xml'
--- en/appendix/files.xml	2016-04-18 21:54:24 +0000
+++ en/appendix/files.xml	2018-06-21 13:42:34 +0000
@@ -16,7 +16,7 @@
 
 </para><para>
 
-<informaltable><tgroup cols="2"><tbody>
+<informaltable arch="not-s390"><tgroup cols="2"><tbody>
 <row>
   <entry><filename>fd0</filename></entry>
   <entry>First Floppy Drive</entry>
@@ -29,20 +29,36 @@
 <informaltable><tgroup cols="2"><tbody>
 <row>
   <entry><filename>sda</filename></entry>
-  <entry>First hard disk</entry>
+  <entry>First <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
 </row><row>
   <entry><filename>sdb</filename></entry>
-  <entry>Second hard disk</entry>
+  <entry>Second <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
 </row><row>
   <entry><filename>sda1</filename></entry>
-  <entry>First partition of the first hard disk</entry>
+  <entry>First partition of the first <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
 </row><row>
   <entry><filename>sdb7</filename></entry>
-  <entry>Seventh partition of the second hard disk</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<informaltable><tgroup cols="2"><tbody>
+  <entry>Seventh partition of the second <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
+</row>
+</tbody></tgroup></informaltable>
+
+<informaltable arch="s390"><tgroup cols="2"><tbody>
+<row>
+  <entry><filename>dasda</filename></entry>
+  <entry>First DASD disk</entry>
+</row><row>
+  <entry><filename>dasdb</filename></entry>
+  <entry>Second DASD disk</entry>
+</row><row>
+  <entry><filename>dasda1</filename></entry>
+  <entry>First partition of the first DASD disk</entry>
+</row><row>
+  <entry><filename>dasdb7</filename></entry>
+  <entry>Seventh partition of the second DASD disk</entry>
+</row>
+</tbody></tgroup></informaltable>
+
+<informaltable arch="not-s390"><tgroup cols="2"><tbody>
 <row>
   <entry><filename>sr0</filename></entry>
   <entry>First CD-ROM</entry>
@@ -52,7 +68,7 @@
 </row>
 </tbody></tgroup></informaltable>
 
-<informaltable><tgroup cols="2"><tbody>
+<informaltable arch="not-s390"><tgroup cols="2"><tbody>
 <row>
   <entry><filename>ttyS0</filename></entry>
   <entry>Serial port 0, COM1 under MS-DOS</entry>
@@ -71,8 +87,8 @@
 <informaltable><tgroup cols="2"><tbody>
 <row>
   <entry><filename>cdrom</filename></entry>
-  <entry>Symbolic link to the CD-ROM drive</entry>
-</row><row>
+  <entry>Symbolic link to the <phrase arch="s390">(virtual) </phrase>CD-ROM drive</entry>
+</row><row arch="not-s390">
   <entry><filename>mouse</filename></entry>
   <entry>Symbolic link to the mouse device file</entry>
 </row>
@@ -176,10 +192,10 @@
  <title>Disk Space Needed for Tasks</title>
 <para>
 
-A standard installation for the amd64 architecture, including all standard
-packages and using the default kernel, takes up &std-system-size;MB of disk space.
-A minimal base installation, without the <quote>Standard system</quote>
-task selected, will take &base-system-size;MB.
+A standard installation for the <phrase arch="not-s390">amd64</phrase><phrase arch="s390">&architecture;</phrase> architecture, including all standard
+packages and using the default kernel, takes up <phrase arch="not-s390">&std-system-size;</phrase><phrase arch="s390">&std-system-size-s390x;</phrase>MB of disk space.
+A minimal base installation, without the <quote>Basic &debian; server</quote>
+task selected, will take <phrase arch="not-s390">&base-system-size;</phrase><phrase arch="s390">&base-system-size-s390x;</phrase>MB.
 
 </para>
 <important><para>
@@ -315,9 +331,9 @@
  <title>Disk Space Needed</title>
 <para>
 
-A minimal server installation of &releasename; requires 400MB of disk space.
-<phrase condition="supports-desktop">The standard Ubuntu desktop installation
-requires 2GB.</phrase>
+A minimal server installation of &releasename; requires <phrase arch="not-s390">400MB</phrase><phrase arch="s390">1.1GB</phrase> of disk space.
+<phrase arch="s390">However, it's recommended to add some extra space. Better plan with at least 2GB for the operating system plus 1GB as room for growth.</phrase>
+<phrase condition="supports-desktop">The standard Ubuntu desktop installation requires 2GB.</phrase>
 
 </para>
  </sect1>

=== modified file 'en/appendix/preseed.xml'
--- en/appendix/preseed.xml	2016-04-18 21:37:25 +0000
+++ en/appendix/preseed.xml	2018-06-21 13:42:34 +0000
@@ -72,28 +72,44 @@
 </thead>
 
 <tbody>
-<row>
-  <entry>CD/DVD</entry>
+<row arch="s390">
+  <entry>generic (network install)</entry>
+  <entry>yes</entry>
+  <entry>no</entry>
+  <entry>yes</entry>
+</row><row>
+  <entry>CD/DVD
+  <footnote arch="s390" id='load-from-removable-media'>
+  <para> 
+  can be done with the help of the HMC task <guimenuitem>Load from Removable Media or Server</guimenuitem>.
+  On &architecture; this is not comparable to other architectures and technically close to a <quote>generic (network install)</quote>.
+  </para> 
+  </footnote>
+  </entry>
   <entry>yes</entry>
   <entry>yes</entry>
   <entry>yes<footnote id='apx-ps-net'>
-
   <para>
   but only if you have network access, and set <literal>preseed/url</literal>
   appropriately
   </para>
-
-  </footnote></entry>
-</row><row>
+  </footnote>
+  </entry>
+</row><row arch="not-s390">
   <entry>netboot</entry>
   <entry>yes</entry>
   <entry>no</entry>
   <entry>yes</entry>
-</row><row>
+</row><row arch="not-s390">
   <entry>hd-media <phrase condition="bootable-usb">(including usb-stick)</phrase></entry>
   <entry>yes</entry>
   <entry>yes</entry>
   <entry>yes<footnoteref linkend="apx-ps-net"/></entry>
+</row><row arch="s390">
+  <entry>USB drive<footnoteref linkend="load-from-removable-media"/></entry>
+  <entry>yes</entry>
+  <entry>yes</entry>
+  <entry>yes</entry>
 </row><row condition="supports-floppy-boot">
   <entry>floppy based (cd-drivers)</entry>
   <entry>yes</entry>
@@ -104,11 +120,6 @@
   <entry>yes</entry>
   <entry>no</entry>
   <entry>yes</entry>
-</row><row arch="s390">
-  <entry>generic</entry>
-  <entry>yes</entry>
-  <entry>no</entry>
-  <entry>yes</entry>
 </row>
 </tbody>
 
@@ -135,7 +146,8 @@
 questions from being asked is to preseed them through the boot parameters,
 as described in <xref linkend="preseed-bootparms"/>.
 
-</para><para>
+</para></important>
+<important><para>
 
 In order to easily avoid the questions that would normally appear before the
 preseeding occurs, you can start the installer in <quote>auto</quote>
@@ -256,17 +268,21 @@
 </para><para>
 
 For the other preseeding methods you need to tell the installer what file
-to use when you boot it. This is normally done by passing the kernel a boot
-parameter, either manually at boot time or by editing the bootloader
-configuration file <phrase arch="linux-any">(e.g.
-<filename>syslinux.cfg</filename>) and adding the parameter to the end of
-the append line(s) for the kernel.</phrase><phrase arch="kfreebsd-any">(e.g.
-<filename>grub.cfg</filename>) and adding the parameter as a new
-<literal>set</literal> line for the kernel.</phrase><phrase arch="hurd-any">(e.g.
+to use when you boot it. This is normally done <phrase arch="not-s390">by passing the kernel a boot
+parameter, either manually at boot time or</phrase> by editing the bootloader
+configuration file <phrase arch="any-86"> <!-- changed from linux-any to any-x86 -->
+(e.g. <filename>syslinux.cfg</filename>) and adding the parameter to the end of
+the append line(s) for the kernel.</phrase>
+<phrase arch="kfreebsd-any">(e.g. <filename>grub.cfg</filename>) and adding the parameter as a new
+<literal>set</literal> line for the kernel.</phrase>
+<phrase arch="hurd-any">(e.g.
 <filename>grub.cfg</filename>) and adding the parameter to the end of the
 <filename>gnumach.gz</filename> line.</phrase>
 
-</para><para>
+<phrase arch="s390">(e.g.
+<filename>parmfile.&debian-lc;</filename>) and adding the parameter to the end (however, the file is empty by default).</phrase>
+
+</para><para arch="not-s390">
 
 If you do specify the preconfiguration file in the bootloader configuration,
 you might change the configuration so you don't need to hit enter to boot the
@@ -282,21 +298,28 @@
 md5sum, and if specified it must match the preconfiguration file or the
 installer will refuse to use it.
 
-</para>
-
-<informalexample><screen>
+</para><para>
 Boot parameters to specify:
+</para>
+<informalexample><screen>
 - if you're netbooting:
   preseed/url=http://host/path/to/preseed.cfg
   preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
 - or
+  preseed/url=ftp://host/path/to/preseed.cfg
+  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
+- or
   preseed/url=tftp://host/path/to/preseed.cfg
   preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
+</screen></informalexample>
 
-- if you're booting a remastered CD:
+<informalexample><screen>
+- if you're booting a remastered CD or image:
   preseed/file=/cdrom/preseed.cfg
   preseed/file/checksum=5da499872becccfeda2c4872f9171c3d
+</screen></informalexample>
 
+<informalexample arch="not-s390"><screen>
 - if you're installing from USB media (put the preconfiguration file in the
   toplevel directory of the USB stick):
   preseed/file=/hd-media/preseed.cfg
@@ -333,18 +356,13 @@
 <userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
 for any of the preseed variables listed in the examples in this appendix.
 If a value is to be used to configure packages for the target system, you
-will need to prepend the <firstterm>owner</firstterm><footnote>
-
-<para>
+will need to prepend the <firstterm>owner</firstterm><footnote><para>
 The owner of a debconf variable (or template) is normally the name of the
 package that contains the corresponding debconf template. For variables
 used in the installer itself the owner is <quote>d-i</quote>.
 Templates and variables can have more than one owner which helps to
 determine whether they can be removed from the debconf database if the
-package is purged.
-</para>
-
-</footnote> of the variable as in
+package is purged.</para></footnote> of the variable as in
 <userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>.
 If you don't specify the owner, the value for the variable will not be
 copied to the debconf database in the target system and thus remain unused
@@ -366,7 +384,7 @@
 <literal>url</literal>. Another example is the <literal>tasks</literal>
 alias, which translates to <literal>tasksel:tasksel/first</literal>.
 
-</para><para>
+</para><para arch="not-s390">
 
 A <quote>---</quote> in the boot options has special meaning. Kernel
 parameters that appear after the last <quote>---</quote> may be copied
@@ -383,10 +401,20 @@
 (crash). (For earlier kernels, these numbers were lower.)
 
 </para></note>
+
+<note arch="s390"><para>
+
+The &debian-lc;.parmfile is limited to 11 lines only, each 80 characters long.
+(The precise limit is 11 lines with each * 80 characters plus additional 10 characters.)
+Hence it's recommended to try specifying more than just one parameter per line, separate parameters by single spaces and use as much (shortened) aliases as possible. But do not specify a single parameter (incl. it's value) across multiple lines!
+The case of the parameter as well as the sequence don't matter.
+
+</para></note>
+
 <para>
 
 For most installations some of the default options in your bootloader
-configuration file, like <literal>vga=normal</literal>, may be safely
+configuration file<phrase arch="not-s390">, like <literal>vga=normal</literal>,</phrase> may be safely
 removed which may allow you to add more options for preseeding.
 
 </para>
@@ -402,7 +430,7 @@
   <title>Auto mode</title>
 <para>
 
-There are several features of &debian; Installer that combine to allow
+There are several features of the &debian; Installer that combine to allow
 fairly simple command lines at the boot prompt to result in
 arbitrarily complex customized automatic installs.
 
@@ -507,10 +535,10 @@
 
 </para><para>
 
-The <literal>auto</literal> boot choice is not yet defined on all arches.
-The same effect may be achieved by simply adding the two
-parameters <literal>auto=true priority=critical</literal> to the kernel
-command line.  The <literal>auto</literal> kernel parameter is an alias for
+The <literal>auto</literal> boot choice is not yet defined on all arches<phrase arch="s390"> (like on &architecture;)</phrase>,
+but the same effect may be achieved by simply adding the two
+parameters <literal>auto=true priority=critical</literal> to the kernel command line.
+The <literal>auto</literal> kernel parameter is an alias for
 <literal>auto-install/enable</literal> and setting it to
 <literal>true</literal> delays the
 locale and keyboard questions until after there has been a chance to
@@ -599,14 +627,15 @@
 }
 </screen></informalexample>
 
-<para>
+<note><para>
 
-Note that the above example limits this filename to DHCP clients that identify
+The above example limits this filename to DHCP clients that identify
 themselves as "d-i", so it will not affect regular DHCP clients, but only
 the installer. You can also put the text in a stanza for only one particular
 host to avoid preseeding all installs on your network.
 
-</para><para>
+</para></note>
+<para>
 
 A good way to use the DHCP preseeding is to only preseed values specific to
 your network, such as the &debian; mirror to use. This way installs on your
@@ -880,9 +909,13 @@
 # netcfg will choose an interface that has link if possible. This makes it
 # skip displaying a list if there is more than one interface.
 d-i netcfg/choose_interface select auto
-
-# To pick a particular interface instead:
-#d-i netcfg/choose_interface select eth1
+<phrase arch="not-s390"># To pick a particular interface instead:
+#d-i netcfg/choose_interface select eth1</phrase>
+<phrase arch="s390"># Activate QETH devices (&architecture;-specific OSA adapters or Hipersockets)
+#d-i s390-netdevice/choose_networktype string qeth
+#d-i s390-netdevice/qeth/choose string 0.0.c000-0.0.c001-0.0.c002
+#d-i s390-netdevice/qeth/layer2 boolean true
+#d-i s390-netdevice/qeth/port string 0</phrase>
 
 # To set a different link detection timeout (default is 3 seconds).
 # Values are interpreted as seconds.
@@ -1124,6 +1157,29 @@
 
   </sect2>
 
+  <sect2 id="s390-disk-storage">
+  <title>&arch-title; specific disk storage</title>
+
+<para>
+The &architecture; offers two unique kinds of disk storage - DASD and FCP (or zFCP).
+
+</para>
+
+<informalexample role="example"><screen>
+# Activate DASD disks
+#d-i s390-dasd/dasd string 0.0.0200,0.0.0300,0.0.0400
+
+# DASD configuration; by default dasdfmt (low-level format) if needed
+#d-i s390-dasd/auto-format boolean true
+#d-i s390-dasd/force-format boolean true
+
+# zFCP activation and configuration
+# d-i s390-zfcp/zfcp string 0.0.1b34:0x400870075678a1b2:0x201480c800000000, \
+#                           0.0.1b34:0x400870075679a1b2:0x201480c800000000
+</screen></informalexample>
+
+  </sect2>
+
   <sect2 id="preseed-partman">
   <title>Partitioning</title>
 <para>
@@ -1636,6 +1692,277 @@
 </screen></informalexample>
 
   </sect2>
+
+  <sect2 id="s390x-specific-preseed-details" arch="s390">
+  <title>Further &arch-title;-specific Preseed Details</title>
+
+<para>
+
+Since the &architecture; comes with it's unique CCW IO-layer,
+it's architecture-specific devices that are based uppon CCW require special preseed settings,
+that have a <quote>s390-</quote> prefix.
+But these settings can also be specified as boot parameters, in this case just without the prefix.
+
+</para><para>
+
+All &architecture;-specific preseed settings are prefixed with "s390-...".
+</para><para>
+With the help of these settings you can even preseed early questions like about the qeth network devices.
+</para><para>
+The best way to look them up is the full list of debconf templates that available <ulink url="https://salsa.debian.org/installer-team">here</ulink>.
+<!-- former link: https://anonscm.debian.org/cgit/d-i/ -->
+</para><para>
+Especially the following templates:
+</para>
+<itemizedlist><listitem><para>
+QETH network devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-netdevice/blob/master/debian/s390-netdevice.templates">s390-netdevice Templates</ulink>
+<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-netdevice.git/plain/debian/s390-netdevice.templates -->
+</para></listitem>
+<listitem><para>
+DASD disk devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-dasd/blob/master/debian/s390-dasd.templates">s390-dasd Templates</ulink>
+<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-dasd.git/plain/debian/s390-dasd.templates -->
+</para></listitem>
+<listitem><para>
+zFCP disk devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-zfcp/blob/master/debian/s390-zfcp.templates">s390-dasd Templates</ulink>
+<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-zfcp.git/plain/debian/s390-zfcp.templates -->
+</para></listitem></itemizedlist>
+
+<para>
+The following tables show the most relevant s390-specific boot parameters: 
+</para>
+
+<para>
+Table: s390-netdevice parameters
+<informaltable>
+<tgroup cols="3">
+<thead>
+<row>
+  <entry>Key</entry>
+  <entry>Value</entry>
+  <entry>Description</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>s390-netdevice/choose_networktype</entry>
+  <entry>selection; choices: ctc, qeth, iucv, virtio</entry>
+  <entry>Network device type</entry>
+</row><row>
+  <entry>s390-netdevice/ctc/protocol</entry>
+  <entry>selection, choices: S/390 (0), Linux (1), OS/390 (3); default: S/390 (0)</entry>
+  <entry>Protocol for this connection</entry>
+</row><row>
+  <entry>s390-netdevice/qeth/choose</entry>
+  <entry>selection, choices: {choices}</entry>
+  <entry>OSA-Express QDIO or Hipersockets device</entry>
+</row><row>
+  <entry>s390-netdevice/qeth/port</entry>
+  <entry>string, default: 0</entry>
+  <entry>Relative Port</entry>
+</row><row>
+  <entry>s390-netdevice/qeth/layer2</entry>
+  <entry>boolean, default: false</entry>
+  <entry>Device in layer2 mode</entry>
+</row><row>
+  <entry>s390-netdevice/iucv/peer</entry>
+  <entry>string</entry>
+  <entry>Name of VM peer</entry>
+</row>
+</tbody></tgroup></informaltable>
+</para>
+
+<para>
+Table: s390-dasd parameters
+<informaltable>
+<tgroup cols="3">
+<thead>
+<row>
+  <entry>Key</entry>
+  <entry>Value</entry>
+  <entry>Description</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>s390-dasd/dasd</entry>
+  <entry>string</entry>
+  <entry>one or more DASD devices using comma ',' to separate multiple entries; complete dasd device number, incl. leading zeros, separated by dots '.'</entry>
+</row><row>
+  <entry>s390-dasd/auto_format</entry>
+  <entry>boolean</entry>
+  <entry>format DASD device automatically in case it is not low-level formatted</entry>
+</row><row>
+  <entry>s390-dasd/force_format</entry>
+  <entry>boolean</entry>
+  <entry>force DASD device format even in case it was already low-level formatted</entry>
+</row>
+</tbody></tgroup></informaltable>
+</para>
+
+<para>
+Table: s390-zfcp parameters
+<informaltable>
+<tgroup cols="3">
+<thead>
+<row>
+  <entry>Key</entry>
+  <entry>Value</entry>
+  <entry>Description</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>s390-zfcp/zfcp</entry>
+  <entry>string</entry>
+  <entry>one or more SCSI devices using comma ',' to separate multiple entries; each entry consists of a zfcp host adapter, optionally followed by the WWPN and LUN, like: 0.0.1234,0.0.5678:0x2005000e11159c32:0x1234567800000000</entry>
+</row>
+</tbody></tgroup></informaltable>
+</para>
+
+  <sect3 id="s390x-preseed-example" arch="s390">
+  <title>&arch-title; Preseed Example</title>
+
+<para>
+
+This example shows a typical preseed configuration for a &architecture; system.
+In such environments static networks are more common that dynamic ones.
+For doing the network configuration at an early stage at least some of the s390-netdevice settings need to be used as boot parameters in the parmfile.
+
+</para><para>
+
+The preseed configuration file can be located on a ftp, tftp or http server or it can be included in the root directory of the initrd. If there is already a ftp server setup for ftp-based network installation, the same system can be used as preseed server. This would also ensure that the preseed file is accessible during boot and install time at the same system. In case the Ubuntu servers have no direct connection to the internet, the public update server can't be directly used, hence the install and preseed system may even act a local archive mirror. In case of a non-interactive installetion with dynamic network some additional resources are obviously needed, like DHCP and DNS.
+
+</para><para>
+
+Here is a set of boot parameters that can be put into the <filename>&debian-lc;.parmfile</filename>.
+It's using as much aliases as possible to keep it compact:
+<informalexample role="example"><screen>
+ro locale=en_US auto=true priority=critical s390-netdevice/choose_networktype=qeth s390-netdevice/qeth/choose=0.0.c000-0.0.c001-0.0.c002 s390-netdevice/qeth/layer2=true s390-netdevice/qeth/port=0 netcfg/get_ipaddress=10.245.236.42 netcfg/get_netmask=255.255.255.0 netcfg/get_gateway=10.245.236.1 netcfg/get_nameservers=10.245.236.1 netdevice/qeth/layer2=true netcfg/confirm_static=true netcfg/disable_dhcp=true netcfg/use_autoconfig=1 netcfg/get_hostname=ZLIN42 netcfg/get_domain=canonical.com url=http://install-server/ubuntu/s390x/preseed.cfg
+</screen></informalexample>
+
+</para><para>
+
+In case the parmfile is used on z/VM and is located there as <filename>&debian-lc; parmfile</filename> on a Minidisk, please remember the file requirements (mode <command>binary</command> / <command>bin</command>, FTP option <command>locsite fix 80</command> and max. 11 lines with each 80 characters + additional 10 characters).
+
+</para><para>
+
+Especially on LPAR installation it's worth to consider using the cio_ignore parameter to hide some of the devices from Linux, which may speedup the boot and install process significantly.
+
+</para><para>
+
+IPv6 addresses of servers hosting preseed configuration files are possible. 
+
+</para><para>
+
+The second part is the preseed.cfg file itself.
+
+<informalexample role="example"><screen>
+#
+# Sample s390x pressed  with static qeth network and DASD disk
+# fcp is included as comment
+# ftp://server/preseed/preseed.cfg
+#
+
+d-i debconf/priority string critical
+d-i auto-install/enable boolean true
+
+# use -proposed udebs
+d-i apt-setup/proposed boolean false
+
+d-i pkgsel/update-policy select unattended-upgrades
+
+# localization
+d-i debian-installer/language string en
+d-i debian-installer/country string US
+d-i debian-installer/locale string en_US.UTF-8
+
+# activate qeth
+d-i s390-netdevice/choose_networktype string qeth
+d-i s390-netdevice/qeth/choose string 0.0.c000-0.0.c001-0.0.c002
+d-i s390-netdevice/qeth/layer2 boolean true
+d-i s390-netdevice/qeth/port string 0
+
+# use static network configuration
+d-i netcfg/choose_interface select auto
+d-i netcfg/disable_autoconfig boolean true
+
+d-i netcfg/get_ipaddress string 10.245.236.42
+d-i netcfg/get_netmask string 255.255.255.0
+d-i netcfg/get_gateway string 10.245.236.1
+d-i netcfg/get_nameservers string 10.245.236.1
+d-i netcfg/confirm_static boolean true
+d-i netcfg/hostname string ZLIN42
+
+# provide network-console password
+d-i network-console/password password pass4install
+d-i network-console/password-again password pass4install
+d-i network-console/start note
+
+# user setup
+d-i passwd/user-fullname string ubuntu
+d-i passwd/username string ubuntu
+d-i passwd/user-password-crypted password $6czoUlkH40NHPJs5.5wdF.kIJFu33VdH0kNMTF$$$QFT6DumGdp5PNjlnnxowinu6tcztRC.
+
+d-i user-setup/encrypt-home boolean false
+
+# enable shadow passwords
+d-i passwd/shadow boolean true
+
+# hw clock
+d-i clock-setup/utc boolean true
+# time zone
+d-i time/zone string US/Eastern
+
+# release to install
+d-i mirror/suite string bionic
+
+# do not enable live installer, use normal instead
+d-i live-installer/enable boolean false
+
+# activate DASD, dasdfmt if needed
+d-i s390-dasd/dasd string 0.0.0200,0.0.0300,0.0.0400
+
+# DASD configuration
+d-i s390-dasd/auto-format boolean true
+d-i s390-dasd/force-format boolean true
+
+# zFCP configuration
+# d-i s390-zfcp/zfcp string 
+# 0.0.2b12:0x400807704798b4a4:0x201480c800000000
+
+# optional lines to overwrite old RAIDs and LVMs ....
+# d-i partman-md/device_remove_md boolean true
+# d-i partman-lvm/device_remove_lvm boolean true
+# d-i partman-lvm/confirm boolean true
+# d-i partman-lvm/confirm_nooverwrite boolean true
+
+# auto-partition, all files in one partition
+d-i partman-auto/method string regular
+d-i partman-auto/choose_recipe select atomic
+d-i partman/choose_partition select finish
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/confirm boolean true
+
+# software selection
+d-i tasksel/first multiselect standard system utilities, OpenSSH server, Basic Ubuntu server
+
+# after installation, install some packages - use only one line!
+d-i preseed/late_command string in-target sed -i s/prohibit-password/yes/g /etc/ssh/sshd_config; apt-install initramfs-tools screen strace vim
+
+# reboot at the end
+d-i finish-install/reboot_in_progress note
+</screen></informalexample>
+
+Further excellent examples can be found at the
+<ulink url="http://www.vm.ibm.com/education/lvc/zlinlvc.html">IBM Live Virtual Class</ulink> portal
+in session <ulink url="http://www.vm.ibm.com/education/lvc/LVC0803.pdf">Fully Automated Installation of Ubuntu Server 16.04 with preseed</ulink>.
+It contains disk configurations examples for two DASDs with LVM, two FCP SCSI LUNs with LVM, a single DASD, a qcow2 image file and a single FCP SCSI disk.
+</para>
+
+  </sect3>
+
+  </sect2>
+
  </sect1>
 
 
@@ -1780,5 +2107,6 @@
 </para>
 
   </sect2>
+
  </sect1>
 </appendix>

=== modified file 'en/boot-installer/intro-firmware.xml'
--- en/boot-installer/intro-firmware.xml	2013-10-08 22:00:29 +0000
+++ en/boot-installer/intro-firmware.xml	2018-06-21 13:42:34 +0000
@@ -7,7 +7,8 @@
 flash chip on the device.  The installer can be written to flash so it will
 automatically start when you reboot your machines.
 
-</para><note><para>
+</para>
+<note><para>
 
 In most cases, changing the firmware of an embedded device voids your
 warranty.  Sometimes you are also not able to recover your device if there

=== modified file 'en/boot-installer/trouble.xml'
--- en/boot-installer/trouble.xml	2018-06-06 21:26:51 +0000
+++ en/boot-installer/trouble.xml	2018-06-21 13:42:34 +0000
@@ -538,13 +538,15 @@
 successful, so that we can get as much information as possible on the largest
 number of hardware configurations. 
 
-</para><note condition="not-ubuntu"><para>
+</para>
+<note condition="not-ubuntu"><para>
 
 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></note><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

=== added file 'en/hardware/disk-storage.xml'
--- en/hardware/disk-storage.xml	1970-01-01 00:00:00 +0000
+++ en/hardware/disk-storage.xml	2018-06-21 13:42:34 +0000
@@ -0,0 +1,36 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: disk-storage.xml 69111 2014-03-19 19:27:26Z merker $ -->
+
+ <sect2 id="disk-storage" arch="s390">
+ <title>Disk Storage on &arch-title;</title>
+<para>
+
+The &arch-title; platform provides two unique storage types:
+
+</para>
+
+<variablelist>
+ <varlistentry>
+
+  <term>DASD</term>
+  <listitem>
+
+  &module-s390-dasd.xml;
+
+  </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+  <term>FCP</term>
+
+  <listitem>
+
+  &module-s390-fcp.xml;
+
+  </listitem>
+ </varlistentry>
+</variablelist>
+
+ </sect2>
+

=== modified file 'en/hardware/hardware-supported.xml'
--- en/hardware/hardware-supported.xml	2018-06-06 21:26:51 +0000
+++ en/hardware/hardware-supported.xml	2018-06-21 13:42:34 +0000
@@ -154,15 +154,15 @@
 -->
 
 <row condition="not-ubuntu">
-  <entry>64bit IBM S/390</entry>
-  <entry>s390x</entry>
+  <entry>64bit IBM &arch-title;</entry>
+  <entry>&architecture;</entry>
   <entry>IPL from VM-reader and DASD</entry>
   <entry>generic</entry>
 </row>
 
 <row> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
   <entry>IBM z/Architecture</entry>
-  <entry>s390x</entry>
+  <entry>&architecture;</entry>
   <entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>
   <entry>zEC12 and newer machines</entry>
 </row>
@@ -395,6 +395,7 @@
 
 &network-cards.xml;
 &accessibility-hardware.xml;
+&disk-storage.xml;
 &supported-peripherals.xml;
 
  </sect1>

=== modified file 'en/howto/installation-howto.xml'
--- en/howto/installation-howto.xml	2018-05-15 18:04:14 +0000
+++ en/howto/installation-howto.xml	2018-06-21 13:42:34 +0000
@@ -38,7 +38,7 @@
 
 For more information on where to get CDs, see <xref linkend="official-cdrom" />.
 
-</para><para>
+</para><para arch="not-s390">
 
 Some installation methods require other images than CD images.
 <phrase condition="unofficial-build">
@@ -48,15 +48,24 @@
 <xref linkend="where-files" /> explains how to find images on &debian;
 mirrors.
 
-</para><para>
-
-The subsections below will give the details about which images you should
+</para><para arch="s390">
+
+The installation on &architecture; requires at least an installer kernel and initrd file.
+This is usually be taken from the <phrase arch="s390"><ulink url="&url-ubuntu-download-s390x;">Official &ubuntu; CD-ROM image</ulink></phrase> (see the ./boot folder) or can be directly downloaded from the &debian; archive page - either the version from <ulink url="http://ports.ubuntu.com/ubuntu-ports/dists/&releasename;/main/installer-s390x/">main</ulink> or (if available) a version from the <ulink url="http://ports.ubuntu.com/ubuntu-ports/dists/&releasename;-updates/main/installer-s390x/">updates</ulink> pocket.
+
+</para><para>
+
+The easiest way is probably to download the (CDROM) image, because the files most people need are there on the image.
+
+</para><para>
+
+The subsections below will give the details about which image(s) you should
 get for each possible means of installation.
 
 </para>
 
   <sect2 id="howto-getting-images-cdrom">
-  <title>CDROM</title>
+  <title>Booting from CDROM</title>
 
 <para condition="not-ubuntu">
 
@@ -70,7 +79,17 @@
 
 </para><para>
 
-Download the image for your architecture and burn it to a CD.
+First of all download the image for your architecture and burn it to a CD/DVD.
+
+</para><para arch="s390">In case you are going to do an installation on &architecture; from CD/DVD-ROM, put the CD/DVD into the HMC's CD/DVD drive and execute the HMC task <guimenuitem>Load from Removable Media or Server</guimenuitem> for the installation and select <guimenuitem>Hardware Management Console CD/DVD-ROM...</guimenuitem>.
+
+</para><para arch="s390">
+
+The installation from a USB drive on &architecture; is very similar (and not comparable to other architectures).
+In such a case just copy the image to a USB drive, plug it into the HMC, execute the HMC task <guimenuitem>Load from Removable Media or Server</guimenuitem> and select <guimenuitem>Hardware Management Console USB flash memory drive...</guimenuitem> - keep in mind that the USB drive needs to be already inserted before you execute the task, otherwise the USB drive option(s) are not listed.
+
+</para><para>
+
 <phrase arch="any-x86">To boot the CD, you may need to change your BIOS
 configuration, as explained in <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
@@ -171,8 +190,8 @@
 
 It's also possible to boot the &ubuntu; installer completely from the net. The
 various methods to netboot depend on your architecture and netboot setup.
-The files in <filename>netboot/</filename> can be used to netboot the &ubuntu;
-installer.
+<phrase arch="not-s390">The files in <filename>netboot/</filename> can be used to netboot the &ubuntu;
+installer.</phrase>
 
 </para><para arch="x86">
 
@@ -184,12 +203,46 @@
 everything will just work.
 For detailed instructions, see <xref linkend="install-tftp" />.
 
+</para><para arch="s390">
+
+Booting the installer from network is on the &architecture; platform quite flexible and convinient, hence the recommended way.
+But some initial steps are required.
+The CD/DVD image needs to be extracted and made available via FTP.
+It's crucial that the FTP server itself is reachable by the HMC, the SE and the LPAR or z/VM guest to be installed.
+A dedicated network is usually setup just for this purpose.
+Once this infrastructure is in place the booting of the installer from FTP can be started with the execution of the HMC task <guimenuitem>Load from Removable Media or Server</guimenuitem>, selecting <guimenuitem>FTP Source</guimenuitem> and specifying <guimenuitem>Host Computer</guimenuitem> (usually specified by IP address), <guimenuitem>User ID</guimenuitem>, <guimenuitem>Password</guimenuitem>, <guimenuitem>Account (optional)</guimenuitem> and <guimenuitem>File location (optional)</guimenuitem>.
+Anonymous FTP is possible, too.
+
 </para>
   </sect2>
 
-  <sect2 arch="linux-any" id="howto-getting-images-hard-disk" condition="not-ubuntu">
-  <title>Booting from hard disk</title>
-<para>
+  <sect2 arch="linux-any" id="howto-getting-images-hard-disk"> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
+  <title>Booting from CMS disk (z/VM)</title>
+<para arch="s390">
+
+On z/VM the usual way to boot the installer is to use the (virtual) puncher.
+At least the files <filename>initrd.&debian-lc;</filename> and <filename>kernel.&debian-lc;</filename> are needed.
+These files need to be carefully transfered to a z/VM CMS disk using mode <command>binary</command> / <command>bin</command> and the FTP option <command>locsite fix 80</command>.
+</para><para>
+It's recommended to download <filename>parmfile.&debian-lc;</filename> and <filename>&debian-lc;.exec</filename> as well, but using <command>ascii</command> mode.
+</para><para>
+Properly transfered to CMS, the installation files can be booted by just executing the <filename>&debian-lc;.exec</filename> REXX script.
+Alternatively you can also execute the steps from the script manually.
+ <informalexample role="example"><screen>
+/* REXX EXEC TO IPL Ubuntu for        */
+/* z Systems FROM THE VM READER.      */
+/*                                    */
+'CP CLOSE RDR'
+'PURGE RDR ALL'
+'SPOOL PUNCH * RDR'
+'PUNCH KERNEL    UBUNTU   * (NOHEADER'
+'PUNCH PARMFILE  UBUNTU   * (NOHEADER'
+'PUNCH INITRD    UBUNTU   * (NOHEADER'
+'CHANGE RDR ALL KEEP NOHOLD'
+'CP IPL 000C CLEAR'
+</screen></informalexample>
+
+</para><para arch="not-s390" condition="not-ubuntu">
 
 It's possible to boot the installer using no removable media, but just an
 existing hard disk, which can have a different OS on it. Download
@@ -229,7 +282,7 @@
 </para><para>
 
 Now sit back while the installer detects some of your hardware, and
-loads the rest of itself from CD, floppy, USB, etc.
+loads the rest of itself from CD, USB<phrase condition="bootable-usb">, floppy</phrase><phrase arch="s390">, network</phrase>, etc.
 
 </para><para>
 
@@ -246,11 +299,14 @@
 
 </para><para>
 
-Setting up your clock and time zone is followed by the creation of user accounts. By
-default you are asked to provide a password for the <quote>root</quote>
+Setting up your clock and time zone is followed by the creation of user accounts.
+
+By default you are asked to provide a password for the <quote>root</quote>
 (administrator) account and information necessary to create one regular user
-account. If you do not specify a password for the <quote>root</quote> user this
-account will be disabled but the <command>sudo</command> package will be installed
+account. If you choose <quote>No</quote> on the
+<guimenuitem>Allow login as root?</guimenuitem> question or if you
+do not specify a password for the <quote>root</quote> user this account
+will be disabled, but the <command>sudo</command> package will be installed
 later to enable administrative tasks to be carried out on the new system.
 
 </para><para>
@@ -273,9 +329,11 @@
 If you want to customize the partition layout, choose <guimenuitem>Manually
 edit partition table</guimenuitem> from the menu, and
 the next screen will show you your partition table, how the partitions will
-be formatted, and where they will be mounted. Select a partition to modify or
-delete it. Remember to assign at least one partition
-for swap space and to mount a partition on <filename>/</filename>.
+be formatted, and where they will be mounted.
+Select a partition to modify or delete it.
+Remember that since 18.04 a swap file is the default, rather than a swap partition.
+But you are still able to assign a partition for swap space.
+Remember to mount one partition on <filename>/</filename> (root).
 For more detailed information on how to use the partitioner, please refer
 to <xref linkend="di-partition" />; the appendix <xref
 linkend="partitioning" /> has more general information about
@@ -315,7 +373,7 @@
 </para><para>
 
 The installer will now tell you that the first stage of installation has
-finished. Remove the CD and hit &enterkey; to reboot
+finished. Remove the CD (if needed) and hit &enterkey; to reboot
 your machine. It should boot up into the newly installed system and
 allow you to log in. This is explained in <xref linkend="boot-new"/>.
 

=== modified file 'en/install-methods/usb-setup/x86.xml'
--- en/install-methods/usb-setup/x86.xml	2016-01-26 07:14:43 +0000
+++ en/install-methods/usb-setup/x86.xml	2018-06-21 13:42:34 +0000
@@ -8,7 +8,8 @@
 We will show how to set up the memory stick to use the first partition,
 instead of the entire device.
 
-</para><note><para>
+</para>
+<note><para>
 
 Since most USB sticks come pre-configured with a single FAT16
 partition, you probably won't have to repartition or reformat the
@@ -36,7 +37,8 @@
 <command>mkdosfs</command> command is contained in the
 <classname>dosfstools</classname> &debian; package.
 
-</para></note><para>
+</para></note>
+<para>
 
 In order to start the kernel after booting from the USB stick, we will
 put a boot loader on the stick. Although any boot loader

=== modified file 'en/partitioning/device-names.xml'
--- en/partitioning/device-names.xml	2015-12-19 21:18:18 +0000
+++ en/partitioning/device-names.xml	2018-06-21 13:42:34 +0000
@@ -11,13 +11,13 @@
 and mount partitions. Here's the basic naming scheme:
 
 </para>
-<itemizedlist arch="not-s390">
-<listitem><para>
+<itemizedlist>
+<listitem arch="not-s390"><para>
 
 The first floppy drive is named <filename>/dev/fd0</filename>.
 
 </para></listitem>
-<listitem><para>
+<listitem arch="not-s390"><para>
 
 The second floppy drive is named <filename>/dev/fd1</filename>.
 
@@ -33,7 +33,7 @@
 and so on.
 
 </para></listitem>
-<listitem><para>
+<listitem arch="not-s390"><para>
 
 The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also
 known as <filename>/dev/sr0</filename>.
@@ -41,7 +41,8 @@
 </para></listitem>
 </itemizedlist>
 
-<itemizedlist arch="s390">
+<para arch="s390">
+<itemizedlist>
 <listitem><para>
 
 The first DASD device is named
@@ -56,14 +57,31 @@
 </para></listitem>
 </itemizedlist>
 
-<para arch="not-s390">
+After dasdz, the naming starts over with dasdaa, dasdab, ... up to dasdzz.
+</para>
+
+<para arch="s390">
 
 The partitions on each disk are represented by appending a decimal
+number to the disk name: <filename>dasda1</filename> and
+<filename>dasda2</filename> represent the first and
+second partitions of the first DASD device in your system.
+
+</para>
+
+<para>
+
+<phrase arch="s390">From a Linux operating system point of view a SCSI/FCP disk looks like and behaves just like a normal SCSI disk. However they are almost always setup in a highly available way using multipath.
+</phrase>
+
+The partitions on each SCSI disk are represented by appending a decimal
 number to the disk name: <filename>sda1</filename> and
 <filename>sda2</filename> represent the first and
 second partitions of the first SCSI disk drive in your system.
 
-</para><para arch="not-s390">
+</para>
+
+<para arch="not-s390">
 
 Here is a real-life example.  Let's assume you have a system with 2
 SCSI disks, one at SCSI address 2 and the other at SCSI address 4.
@@ -74,14 +92,18 @@
 <filename>sda3</filename>.  The same applies to the
 <filename>sdb</filename> disk and its partitions.
 
-</para><para arch="not-s390">
+</para>
+
+<para>
 
 Note that if you have two SCSI host bus adapters (i.e., controllers),
 the order of the drives can get confusing.  The best solution in this
 case is to watch the boot messages, assuming you know the drive models
 and/or capacities.
 
-</para><para arch="x86">
+</para>
+
+<para arch="x86">
 
 Linux represents the primary partitions as the drive name, plus the
 numbers 1 through 4.  For example, the first primary partition on the
@@ -91,19 +113,15 @@
 partition, that is, the primary partition holding the logical
 partitions, is not usable by itself.
 
-</para><para arch="sparc">
+</para>
+
+<para arch="sparc">
 
 Sun disk partitions allow for 8 separate partitions (or slices). The
 third partition is usually (and is preferred to have) the <quote>Whole
 Disk</quote> partition. This partition references all of the sectors of the
 disk, and is used by the boot loader (either SILO, or Sun's).
 
-</para><para arch="s390">
-
-The partitions on each disk are represented by appending a decimal
-number to the disk name: <filename>dasda1</filename> and
-<filename>dasda2</filename> represent the first and
-second partitions of the first DASD device in your system.
-
 </para>
+
  </sect1>

=== modified file 'en/partitioning/partition-programs.xml'
--- en/partitioning/partition-programs.xml	2015-12-19 21:18:18 +0000
+++ en/partitioning/partition-programs.xml	2018-06-21 13:42:34 +0000
@@ -99,9 +99,9 @@
 <listitem><para>
 
 &arch-title; version of <command>fdisk</command>; Please read the
-fdasd manual page or chapter 13 in
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/docu/l390dd08.pdf">
-Device Drivers and Installation Commands</ulink> for details.
+IBM Linux on Z and LinuxONE s390-tools overview and find the fdasd section there
+<ulink url="https://www.ibm.com/developerworks/linux/linux390/s390-tools-overview.html">
+s390-tools overview</ulink> for further details.
 
 </para></listitem>
 </varlistentry>
@@ -111,7 +111,7 @@
 
 One of these programs will be run by default when you select
 <guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible
-to use a different partitioning tool from the command line on VT2, but this
+to use a different partitioning tool<phrase arch="not-s390"> from the command line on VT2</phrase>, but this
 is not recommended.
 
 </para><para arch="any-x86">Remember to mark your boot partition as

=== modified file 'en/partitioning/schemes.xml'
--- en/partitioning/schemes.xml	2015-12-19 21:18:18 +0000
+++ en/partitioning/schemes.xml	2018-06-21 13:42:34 +0000
@@ -7,7 +7,7 @@
 <para>
 
 For new users, personal &debian; boxes, home systems, and other
-single-user setups, a single <filename>/</filename> partition (plus
+single-user setups, a single <filename>/</filename> partition (possibly plus a separate
 swap) is probably the easiest, simplest way to go.  However, if your
 partition is larger than around 6GB, choose ext3 as your partition
 type.  Ext2 partitions need periodic file system integrity checking,

=== modified file 'en/partitioning/sizing.xml'
--- en/partitioning/sizing.xml	2018-06-06 21:26:51 +0000
+++ en/partitioning/sizing.xml	2018-06-21 13:42:34 +0000
@@ -13,9 +13,9 @@
 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. <!-- 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.</-->
+memory</quote>.
+&arch-kernel; may use a separate swap partition more efficiently compared to a swap file, but on the other hand side a swap file wastes less disk space compared to a permanently allocated swap partition.
+<!-- 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/rescue.xml'
--- en/post-install/rescue.xml	2018-06-06 21:26:51 +0000
+++ en/post-install/rescue.xml	2018-06-21 13:42:34 +0000
@@ -13,30 +13,110 @@
 have a system to work from while you fix it, and rescue mode can be useful
 for this.
 
-</para><para arch="not-s390">
-
-<!-- TODO: describe what to do on arches where this isn't set up in the
-     bootloader -->
+</para><para>
+
+There are several options to rescue a broken &debian; system on &architecture;:
+
+</para>
+<itemizedlist>
+<listitem arch="not-s390"><para>
+<!-- TODO: describe what to do on arches where this isn't set up in the bootloader -->
 
 To access rescue mode, select <userinput>rescue</userinput> from the
-boot menu, type <userinput>rescue</userinput> at the
-<prompt>boot:</prompt> prompt, or boot with the
-<userinput>rescue/enable=true</userinput> boot parameter. You'll be
-shown the first few screens of the installer, with a note in the
+boot menu (if available) or append the boot parameter <userinput>rescue</userinput>
+or <userinput>systemd.unit=emergency.target</userinput>
+to the <guimenuitem>linux</guimenuitem> kernel boot entry of the boot loader.
+
+</para><para>
+
+While booting the system enter the boot loader menu:
+
+<informalexample role="example"><screen>
+                             GNU GRUB  version 2.02
+
+ ┌────────────────────────────────────────────────────────────────────────────┐
+ │*Ubuntu                                                                     │
+ │ Advanced options for Ubuntu                                                │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ │                                                                            │
+ └────────────────────────────────────────────────────────────────────────────┘ 
+
+      Use the ↑ and ↓ keys to select which entry is highlighted.
+      Press enter to boot the selected OS, 'e' to edit the commands
+      before booting or 'c' for a command-line.
+</screen></informalexample>
+
+Then type <command>e</command> to edit the boot loader configuration and entries,
+navigate to your prefered Linux kernel line and append either
+<userinput>rescue</userinput> or <userinput>systemd.unit=emergency.target</userinput>.
+
+<informalexample role="example"><screen>
+                             GNU GRUB  version 2.02
+
+ ┌────────────────────────────────────────────────────────────────────────────┐
+ │                insmod ext2                                                 │
+ │                set root='hd0,gpt2'or Ubuntu                                │
+ │                if [ x$feature_platform_search_hint = xy ]; then            │
+ │                  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,g\│
+ │pt2 --hint-efi=hd0,gpt2 --hint-baremetal=ahci0,gpt2  ea967ae0-7519-11eB-85b\│
+ │d-5254008bdef4                                                              │
+ │                else                                                        │
+ │                  search --no-floppy --fs-uuid --set=root ea967ae0-7519-11e\│
+ │8-85bd-5254008bdef4                                                         │
+ │                fi                                                          │
+ │                echo        'Loading Linux 4.15.0-23-generic ...'           │
+ │                linux        /boot/vmlinuz-4.15.0-23-generic root=UUID=ea96\│
+ │7ae0-7519-11eB-85bd-5254008bdef4 ro  maybe-ubiquity rescue                  │
+ └────────────────────────────────────────────────────────────────────────────┘ 
+
+      Minimum Emacs-like screen editing is supported. TAB lists
+      completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for
+      a command-line or ESC to discard edits and return to the GRUB menu.
+</screen></informalexample>
+
+Then press either Ctrl-x or F10 to boot with the modified entry
+and the system will enter the rescue mode.
+
+<informalexample role="example"><screen>
+...
+[  OK  ] Started Update UTMP about System Runlevel Changes.
+You are in rescue mode. After logging in, type "journalctl -xb" to view
+system logs, "systemctl reboot" to reboot, "systemctl default" or "exit"
+to boot into default mode.
+Press Enter for maintenance
+(or press Control-D to continue):
+root@ubuntu:~#
+</screen></informalexample>
+
+</para></listitem>
+
+<listitem arch="not-s390"><para>
+<!-- TODO: describe what to do on arches where this isn't set up in the bootloader -->
+
+Alternatively the installer can be booted with the <userinput>rescue=true</userinput> boot parameter. <!-- FIXME: Does this still apply for amd64, since there is subuquity on amd64? -->
+You'll be shown the first few screens of the installer, with a note in the
 corner of the display to indicate that this is rescue mode, not a full
 installation. Don't worry, your system is not about to be overwritten!
 Rescue mode simply takes advantage of the hardware detection
 facilities available in the installer to ensure that your disks,
-network devices, and so on are available to you while repairing your
-system.
-
-</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>.
+network devices, and so on are available to you while repairing your system.
+
+</para><para>
+
+</para></listitem>
+
+<listitem arch="s390"><para> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
+
+The zipl boot menu offers by default 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
   
@@ -46,43 +126,213 @@
  2. old 
 Please choose (default will boot in 10 seconds):
 </screen></informalexample>
-Boot problems are often introduced by a kernel change.
+Boot problems are often introduced with 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">
-
+</para></listitem>
+<listitem arch="s390"><para> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
+
+Another option is to use the installation kernel and initrd in it's rescue mode (sometimes also known as recovery mode).
+To activate the rescue mode, one needs to boot with the <quote>rescue/enable=true</quote> boot parameter,
+and this parameter needs to be added to the <filename>parmfile.&debian-lc;</filename> file.
+This is slightly different for an LPAR compared to a z/VM guest.
+
+</para><para>
+For an LPAR change to the network install server, where the image got extracted and enter the image's ./boot folder.
+You can now just open the <filename>parmfile.&debian-lc;</filename>, add the <quote>rescue/enable=true</quote> boot parameter
+and proceed like you would usually do for an LPAR installation, means with the HMC task
+<guimenuitem>Load from Removable Media or Server</guimenuitem>.
+</para><para>
+But at this point it's better to add a dedicated boot entry for the rescue mode.
+Therefore you need to copy the <filename>parmfile.&debian-lc;</filename> and the <filename>&debian-lc;.ins</filename>
+to create seperate versions for the rescue mode which finally result in a separate rescue mode entry at the <guimenuitem>Load from Removable Media or Server</guimenuitem> task:
+
+<informalexample role="example"><screen>
+Login to your network boot (FTP) server.
+
+$ cd &lt;path to the extracted &debian-lc; server image&gt;/&debian-lc;-server-&release;/boot
+$ cp &debian-lc;.ins rescue.ins
+$ cp parmfile.&debian-lc; parmfile.rescue
+
+Change rescue.ins from it's default:
+$ cat rescue.ins
+* &debian; for z Series (default kernel)
+kernel.&debian-lc; 0x00000000
+initrd.off 0x0001040c
+initrd.siz 0x00010414
+parmfile.&debian-lc; 0x00010480
+initrd.&debian-lc; 0x01000000
+
+To the following:
+$ cat rescue.ins
+* &debian; for z Series (default kernel)
+kernel.&debian-lc; 0x00000000
+initrd.off 0x0001040c
+initrd.siz 0x00010414
+parmfile.rescue 0x00010480
+initrd.&debian-lc; 0x01000000
+
+And open parmfile.rescue and add <quote>rescue/enable=true</quote> (the parmfile is empty by default):
+$ cat parmfile.rescue
+rescue/enable=true
+</screen></informalexample>
+
+Now start the <guimenuitem>Load from Removable Media or Server</guimenuitem> task, select <guimenuitem>FTP source</guimenuitem>,
+enter the data of your network boot (FTP) server, and the step <guimenuitem>Select the software to install</guimenuitem>
+you will find in addition to the default entry another entry for the rescue mode:
+
+<informalexample role="example"><screen>
+Load from Removable Media or Server - Select Software to Install - P00ABCDE:LINLPAR
+Select the software to install.
+Select | Name                                | Description
+  *    | &debian-lc;-server-&release;/boot/rescue.ins | &debian; for z Series (default kernel)
+  o    | &debian-lc;-server-&release;/boot/&debian-lc;.ins | &debian; for z Series (default kernel)
+</screen></informalexample>
+
+Make sure <guimenuitem>&debian-lc;-server-&release;/boot/rescue.ins</guimenuitem> is selected and proceed with <guimenuitem>OK</guimenuitem>.
+</para><para>
+For a z/VM guest you need to access the Minidisk where the installer files,
+including the <filename>parmfile.&debian-lc;</filename> is located, add the <quote>rescue/enable=true</quote> boot parameter
+and proceed like you would usually do for a z/VM installation, means by executing the <guimenuitem>&debian-lc; exec</guimenuitem> REXX script.
+
+But here it's again better to add a dedicated boot script for the rescue mode.
+Therefore you need to copy the <filename>parmfile &debian-lc;</filename> and the <filename>&debian-lc; exec</filename>
+to create seperate versions for the rescue mode:
+
+<informalexample role="example"><screen>
+Logon to your z/VM system, have CMS active (ipl-ed) 
+and make sure you have r/w acces to the Minidisk where the installations files are located.
+In this example <quote>File Mode</quote> (Fm) <quote>A</quote> is used, that might be different on your system.
+Copy the following files:
+
+copyfiles &debian-lc; exec a rescue exec a 
+copyfiles parmfile &debian-lc; a parmfile rescue a
+
+listfiles rescue * a
+RESCUE EXEC     A1
+listfiles * rescue a
+PARMFILE RESCUE A1
+
+Change PARMFILE RESCUE (by default it's empty):
+
+x PARMFILE RESCUE A
+* * * Top of File * * *
+                      
+* * * End of File * * *
+
+To the following:
+
+x PARMFILE RESCUE A
+* * * Top of File * * *
+rescue/enable=true     
+* * * End of File * * *
+
+Now modify the RESCUE EXEC file as well so that it point to the new <filename>parmfile rescue</filename> file:
+x RESCUE EXEC A
+* * * Top of File * * *
+/* REXX EXEC TO IPL &debian;'s Rescue Mode */
+/* z Systems FROM THE VM READER.         */
+/*                                       */
+'CP CLOSE RDR'                          
+'PURGE RDR ALL'                         
+'SPOOL PUNCH * RDR'                     
+'PUNCH KERNEL    UBUNTU * (NOHEADER'   
+'PUNCH PARMFILE  RESCUE * (NOHEADER'   
+'PUNCH INITRD    UBUNTU * (NOHEADER'   
+'CHANGE RDR ALL KEEP NOHOLD'            
+'CP IPL 000C CLEAR'                     
+* * * End of File * * * 
+</screen></informalexample>
+</para>
+
+<para>Now start the z/VM guest installation as usual, but using the newly created REXX script for the rescue mode, hence just type:
+<command>rescue &lt;Enter&gt;</command>
+</para><para>
+Don't worry, your system is not about to be overwritten! <quote>Rescue</quote> mode simply takes advantage of the hardware detection facilities available in the installer to ensure that your disks, network devices, and so on are available to you while repairing your system. 
+</para>
+
+<para>Using either of the two installation types you'll be shown the first few screens of the installer, with a note in the corner of the display to indicate that this is rescue mode, not a full installation:
+
+<informalexample role="example"><screen>
+Rescue mode
+             ┌─────────┤ [?] Ubuntu installer main menu ├─────────┐             
+             │                                                    │             
+             │ Choose the next step in the install process:       │             
+             │                                                    │             
+             │      Configure the network device                  │             
+             │      Configure the network                         │             
+             │      Choose language                               │             
+             │      Choose a mirror of the Ubuntu archive         │             
+             │      Download installer components                 │             
+             │      Change debconf priority                       │             
+             │      Save debug logs                               │             
+             │      Execute a shell                               │             
+             │      Abort the installation                        │             
+             │                                                    │             
+             └────────────────────────────────────────────────────┘ 
+</screen></informalexample>
+
+Don't worry, your system is not about to be overwritten! Rescue mode simply takes advantage of the hardware detection facilities available in the installer to ensure that your disks, network devices, and so on are available to you while repairing your system.</para>
+
+<para>
 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,
 you should select the partition containing the root file system that you
 need to repair. You may select partitions on RAID and LVM devices as well as
-those created directly on disks.
-
-</para><para arch="not-s390">
+those created directly on disks:
+
+<informalexample role="example"><screen>
+Rescue mode                                                                     
+  ┌───────────────────────┤ [!!] Enter rescue mode ├────────────────────────┐   
+  │                                                                         │   
+  │ Enter a device you wish to use as your root file system. You will be    │   
+  │ able to choose among various rescue operations to perform on this       │   
+  │ file system.                                                            │   
+  │                                                                         │   
+  │ If you choose not to use a root file system, you will be given a        │   
+  │ reduced choice of operations that can be performed without one. This    │   
+  │ may be useful if you need to correct a partitioning problem.            │   
+  │                                                                         │   
+  │ Device to use as root file system:                                      │   
+  │                                                                         │   
+  │                    /dev/sda1                                            │   
+  │                    /dev/sdb1                                            │   
+  │                    Assemble RAID array                                  │   
+  │                                                                         │   
+  │     &lt;Go Back&gt;                                                           │   
+  │                                                                         │   
+  └─────────────────────────────────────────────────────────────────────────┘   
+</screen></informalexample>
+
+<!---
+The <guimenuitem>Ubuntu installer main menu</guimenuitem> provides the menu item <guimenuitem>Enter rescue mode</guimenuitem>.
+
+<informalexample role="example"><screen>
+Rescue mode                                                                     
+        ┌──────────────┤ [?] Ubuntu installer main menu ├──────────────┐        
+        │                                                              │        
+        │ Choose the next step in the install process:                 │        
+        │                                                              │        
+        │  Detect virtual driver disks from hardware manufacturer      │
+        │  Configure the network device                                │
+        │  Configure the network                                       │
+        │  Choose language                                             │
+        │  Choose a mirror of the Ubuntu archive                       │
+        │  Download installer components                               │
+        │  Configure the clock                                         │
+        │  Configure direct access storage devices (DASD)              │
+        │  Activate FCP devices for installation                       │
+        │  Detect disks                                                │
+        │  Enter rescue mode *                                         │
+        │                                                              │        
+        └──────────────────────────────────────────────────────────────┘        
+</screen></informalexample>
+-->
+
+</para><para>  <!-- removed: 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
-repairs.
+file system you selected, which you can use to perform any necessary repairs.
 
 <phrase arch="any-x86">
 For example, if you need to reinstall the GRUB boot loader into the master
@@ -90,16 +340,45 @@
 <userinput>grub-install '(hd0)'</userinput> to do so.
 </phrase>
 
-</para><para arch="not-s390">
+</para><para>  <!-- removed: 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
 warning and offer to give you a shell in the installer environment instead.
+
 You may not have as many tools available in this environment, but they will
-often be enough to repair your system anyway. The root file system you
+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 arch="not-s390">
+</para></listitem>
+<listitem><para> <!-- FIXME: Does this still apply for amd64, since there is subuquity on amd64? -->
+
+A trivial option is to just boot the standard installation kernel and initrd without any additional kernel parameter, 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.
+While not using the rescue mode, be careful to not accidentially repartition or format any disk which may cause data loss.
+
+</para>
+</listitem>
+</itemizedlist><para>
 
 In either case, after you exit the shell, the system will reboot.
 

=== modified file 'en/preparing/non-debian-partitioning.xml'
--- en/preparing/non-debian-partitioning.xml	2018-06-06 21:26:51 +0000
+++ en/preparing/non-debian-partitioning.xml	2018-06-21 13:42:34 +0000
@@ -21,7 +21,7 @@
 If you already have an operating system on your system
 
 <phrase arch="any-x86">
-(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
+(Windows 9x, Windows NT/2000/XP/2003/Vista/7/8/10, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
 </phrase>
 
 <phrase arch="s390">
@@ -34,12 +34,13 @@
 partitions with other Unix systems, but that's not covered here.
 At the very least you will need a dedicated partition for the &debian;
 root filesystem.
-<note><para arch="s390">
+
+<note arch="s390"><para>
 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>
-
+</para>
+
+<para>
 You can find information about your current partition setup by using
 a partitioning tool for your current operating system<phrase
 arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in

=== modified file 'en/using-d-i/modules/localechooser.xml'
--- en/using-d-i/modules/localechooser.xml	2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/localechooser.xml	2018-06-21 13:42:34 +0000
@@ -63,13 +63,15 @@
 that country selected as the default. Use the <guibutton>Go Back</guibutton>
 option to select countries on a different continent.
 
-</para><note><para>
+</para>
+<note><para>
 
 It is important to select the country where you live or where you are
 located as it determines the time zone that will be configured for the
 installed system.
 
-</para></note><para>
+</para></note>
+<para>
 
 If you selected a combination of language and country for which no locale is
 defined and there exist multiple locales for the language, then the installer

=== modified file 'en/using-d-i/modules/mdcfg.xml'
--- en/using-d-i/modules/mdcfg.xml	2015-12-19 21:18:18 +0000
+++ en/using-d-i/modules/mdcfg.xml	2018-06-21 13:42:34 +0000
@@ -211,7 +211,8 @@
 <guimenu>Use as:</guimenu> <guimenuitem>physical volume for
 RAID</guimenuitem> </menuchoice>.)
 
-</para><note><para>
+</para>
+<note><para>
 
 Make sure that the system can be booted with the partitioning scheme
 you are planning. In general it will be necessary to create a separate
@@ -222,7 +223,8 @@
 <filename>/</filename> and RAID1 for <filename>/boot</filename> can be
 an option.
 
-</para></note><para>
+</para></note>
+<para>
 
 Next, you should choose <guimenuitem>Configure software
 RAID</guimenuitem> from the main <command>partman</command> menu.

=== modified file 'en/using-d-i/modules/netcfg.xml'
--- en/using-d-i/modules/netcfg.xml	2018-06-06 21:26:51 +0000
+++ en/using-d-i/modules/netcfg.xml	2018-06-21 13:42:34 +0000
@@ -56,7 +56,8 @@
 Fill in the answers from
 <xref linkend="needed-info"/>.
 
-</para><note><para>
+</para>
+<note><para>
 
 Some technical details you might, or might not, find handy: the program
 assumes the network IP address is the bitwise-AND of your system's IP
@@ -64,7 +65,9 @@
 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 &mdash; if necessary, you can
-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.
+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	2018-06-06 21:26:51 +0000
+++ en/using-d-i/modules/network-console.xml	2018-06-21 13:42:34 +0000
@@ -69,7 +69,8 @@
 login the fingerprint of the remote system will be displayed and
 you will have to confirm that it is correct.
 
-</para><note><para>
+</para>
+<note><para>
 
 The <command>ssh</command> server in the installer uses a default
 configuration that does not send keep-alive packets. In principle,
@@ -108,7 +109,8 @@
 <command>ssh-keygen -R &lt;<replaceable>hostname</replaceable>|<replaceable>IP&nbsp;address</replaceable>&gt;</command>.
 </para></footnote> and try again.
 
-</para></note><para>
+</para></note>
+<para>
 
 After the login you will be presented with an initial screen where you
 have two possibilities called <guimenuitem>Start menu</guimenuitem> and

=== modified file 'en/using-d-i/modules/partman-crypto.xml'
--- en/using-d-i/modules/partman-crypto.xml	2018-06-06 21:26:51 +0000
+++ en/using-d-i/modules/partman-crypto.xml	2018-06-21 13:42:34 +0000
@@ -30,14 +30,20 @@
 unencrypted, because currently there is no way to load the kernel from
 an encrypted partition.
 
-</para><note><para>
+</para>
+<note><para>
 
 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, 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>.
+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>
+</para></note>
+<para>
 
 To use encryption, you have to create a new partition by selecting
 some free space in the main partitioning menu. Another option is to

=== modified file 'en/using-d-i/modules/partman.xml'
--- en/using-d-i/modules/partman.xml	2018-06-06 21:26:51 +0000
+++ en/using-d-i/modules/partman.xml	2018-06-21 13:42:34 +0000
@@ -332,12 +332,14 @@
 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).</para>
+<note><para>
+This particular setup cannot be created
 using guided partitioning but it does show possible variation that can
-be achieved using manual partitioning.</note>
-
-</para><para>
-
+be achieved using manual partitioning.
+</para></note>
+
+<para>
 This concludes the guided partitioning. If you are satisfied with the
 generated partition table, you can choose <guimenuitem>Finish
 partitioning and write changes to disk</guimenuitem> from the menu to

=== modified file 'en/using-d-i/modules/pkgsel.xml'
--- en/using-d-i/modules/pkgsel.xml	2018-06-06 21:26:51 +0000
+++ en/using-d-i/modules/pkgsel.xml	2018-06-21 13:42:34 +0000
@@ -46,7 +46,9 @@
 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">
+</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,
@@ -54,6 +56,7 @@
 <guimenuitem>OpenSSH server</guimenuitem> task is selected to not.
 
 </para>
+
 <tip><para>
 
 In the standard user interface of the installer, you can use the space bar
@@ -76,7 +79,7 @@
 </para><para>
 
 Note that this will only work if the packages needed for the desired desktop
-environment are actually available.  If you are installing using a single
+environment are actually available. If you are installing using a single
 full CD image, they will possibly need to be downloaded from a network mirror as
 some of the needed packages for your choice might only be included on later
 CDs. Installing any of the available desktop environments this way should

=== modified file 'en/using-d-i/modules/s390/dasd.xml'
--- en/using-d-i/modules/s390/dasd.xml	2005-10-07 19:51:38 +0000
+++ en/using-d-i/modules/s390/dasd.xml	2018-06-21 13:42:34 +0000
@@ -1,2 +1,9 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id: dasd.xml 11648 2004-03-22 00:37:46Z joeyh $ -->
+
+<para>
+
+DASDs (Direct Attached Storage Devices) are Enhanced Count Key Data (ECKD) encoded, FICON-attached devices and belong to the CCW (channel command word) IO-layer that is unique to &architecture;. They are available in different types, like the common types 3390-3 (or Model 3), 3390-9 (or Model 9), 3390-27 (or Model 27), 3390-54 (or Model 54), or others.
+The DASD block size is 4096 bytes (4KB) and they support up to 3 partitions per volume.
+
+</para>

=== added file 'en/using-d-i/modules/s390/fcp.xml'
--- en/using-d-i/modules/s390/fcp.xml	1970-01-01 00:00:00 +0000
+++ en/using-d-i/modules/s390/fcp.xml	2018-06-21 13:42:34 +0000
@@ -0,0 +1,13 @@
+
+<para>
+
+FCP (Fiber Channel Protocol, also known as zfcp) devices are SCSI (Small Computer System Interface) disk storage devices that are attached using the Fiber Channel Protocol (FCP), use a 512-byte Fixed Block Architecture (FBA) encoding and also belong to the CCW IO-layer. These SCSI (over-FCP) devices can be defined in any size (up to 2TB) at the storage subsystem and support up to 15 partitions per volume.
+
+<note><para>
+
+z/VM supports FCP devices as <quote>emulated devices</quote>, or in short <quote>EDEV</quote>.
+In this case SCSI disks are configured as disk units of type DASD 9336 FBA.
+For more details see the IBM z/VM documentation.
+</para></note>
+
+</para>