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

Proposed by Frank Heimes on 2018-06-21
Status: Merged
Merged at revision: 548
Proposed branch: lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 2313 lines (+1213/-234)
27 files modified
build/entities/common.ent (+2/-0)
build/templates/docstruct.ent (+5/-3)
doc/cheatsheet.xml (+8/-0)
en/appendix/chroot-install.xml (+226/-41)
en/appendix/files.xml (+35/-19)
en/appendix/preseed.xml (+373/-45)
en/boot-installer/intro-firmware.xml (+2/-1)
en/boot-installer/trouble.xml (+4/-2)
en/hardware/disk-storage.xml (+36/-0)
en/hardware/hardware-supported.xml (+4/-3)
en/howto/installation-howto.xml (+78/-20)
en/install-methods/usb-setup/x86.xml (+4/-2)
en/partitioning/device-names.xml (+35/-17)
en/partitioning/partition-programs.xml (+4/-4)
en/partitioning/schemes.xml (+1/-1)
en/partitioning/sizing.xml (+3/-3)
en/post-install/rescue.xml (+329/-50)
en/preparing/non-debian-partitioning.xml (+6/-5)
en/using-d-i/modules/localechooser.xml (+4/-2)
en/using-d-i/modules/mdcfg.xml (+4/-2)
en/using-d-i/modules/netcfg.xml (+5/-2)
en/using-d-i/modules/network-console.xml (+4/-2)
en/using-d-i/modules/partman-crypto.xml (+9/-3)
en/using-d-i/modules/partman.xml (+7/-5)
en/using-d-i/modules/pkgsel.xml (+5/-2)
en/using-d-i/modules/s390/dasd.xml (+7/-0)
en/using-d-i/modules/s390/fcp.xml (+13/-0)
To merge this branch: bzr merge lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2018-06-21 Pending
Review via email: mp+348331@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
88<!-- Size of the basic installation -->88<!-- Size of the basic installation -->
89 <!ENTITY base-system-size "506">89 <!ENTITY base-system-size "506">
90 <!ENTITY std-system-size "822">90 <!ENTITY std-system-size "822">
91 <!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 -->
92 <!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 -->
91<!-- Desktop environment task - GNOME -->93<!-- Desktop environment task - GNOME -->
92 <!ENTITY task-desktop-gnome-inst "2487">94 <!ENTITY task-desktop-gnome-inst "2487">
93 <!ENTITY task-desktop-gnome-dl "765">95 <!ENTITY task-desktop-gnome-dl "765">
9496
=== 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 @@
30 <!ENTITY supported-powerpc.xml SYSTEM "##SRCPATH##/hardware/supported/powerpc.xml">30 <!ENTITY supported-powerpc.xml SYSTEM "##SRCPATH##/hardware/supported/powerpc.xml">
31 <!ENTITY supported-s390.xml SYSTEM "##SRCPATH##/hardware/supported/s390.xml">31 <!ENTITY supported-s390.xml SYSTEM "##SRCPATH##/hardware/supported/s390.xml">
32 <!ENTITY supported-sparc.xml SYSTEM "##SRCPATH##/hardware/supported/sparc.xml">32 <!ENTITY supported-sparc.xml SYSTEM "##SRCPATH##/hardware/supported/sparc.xml">
33 <!ENTITY network-cards.xml SYSTEM "##SRCPATH##/hardware/network-cards.xml">33 <!ENTITY network-cards.xml SYSTEM "##SRCPATH##/hardware/network-cards.xml">
34 <!ENTITY supported-peripherals.xml SYSTEM "##SRCPATH##/hardware/supported-peripherals.xml">34 <!ENTITY disk-storage.xml SYSTEM "##SRCPATH##/hardware/disk-storage.xml">
35 <!ENTITY supported-peripherals.xml SYSTEM "##SRCPATH##/hardware/supported-peripherals.xml">
35 <!ENTITY accessibility-hardware.xml SYSTEM "##SRCPATH##/hardware/accessibility.xml">36 <!ENTITY accessibility-hardware.xml SYSTEM "##SRCPATH##/hardware/accessibility.xml">
36 <!ENTITY buying-hardware.xml SYSTEM "##SRCPATH##/hardware/buying-hardware.xml">37 <!ENTITY buying-hardware.xml SYSTEM "##SRCPATH##/hardware/buying-hardware.xml">
37 <!ENTITY installation-media.xml SYSTEM "##SRCPATH##/hardware/installation-media.xml">38 <!ENTITY installation-media.xml SYSTEM "##SRCPATH##/hardware/installation-media.xml">
@@ -94,12 +95,13 @@
94 <!ENTITY boot-installer-accessibility.xml SYSTEM "##SRCPATH##/boot-installer/accessibility.xml">95 <!ENTITY boot-installer-accessibility.xml SYSTEM "##SRCPATH##/boot-installer/accessibility.xml">
95 <!ENTITY boot-installer-trouble.xml SYSTEM "##SRCPATH##/boot-installer/trouble.xml">96 <!ENTITY boot-installer-trouble.xml SYSTEM "##SRCPATH##/boot-installer/trouble.xml">
9697
97 <!ENTITY using-d-i.xml SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml">98 <!ENTITY using-d-i.xml SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml">
98 <!ENTITY using-d-i-components.xml SYSTEM "##SRCPATH##/using-d-i/components.xml">99 <!ENTITY using-d-i-components.xml SYSTEM "##SRCPATH##/using-d-i/components.xml">
99100
100 <!ENTITY module-localechooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/localechooser.xml">101 <!ENTITY module-localechooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/localechooser.xml">
101 <!ENTITY module-s390-netdevice.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/netdevice.xml">102 <!ENTITY module-s390-netdevice.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/netdevice.xml">
102 <!ENTITY module-s390-dasd.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/dasd.xml">103 <!ENTITY module-s390-dasd.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/dasd.xml">
104 <!ENTITY module-s390-fcp.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/fcp.xml">
103 <!ENTITY module-ddetect.xml SYSTEM "##SRCPATH##/using-d-i/modules/ddetect.xml">105 <!ENTITY module-ddetect.xml SYSTEM "##SRCPATH##/using-d-i/modules/ddetect.xml">
104 <!ENTITY module-kbd-chooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/kbd-chooser.xml">106 <!ENTITY module-kbd-chooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/kbd-chooser.xml">
105 <!ENTITY module-netcfg.xml SYSTEM "##SRCPATH##/using-d-i/modules/netcfg.xml">107 <!ENTITY module-netcfg.xml SYSTEM "##SRCPATH##/using-d-i/modules/netcfg.xml">
106108
=== 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 @@
145A paragraph only interesting for Linux/arm64 users. 145A paragraph only interesting for Linux/arm64 users.
146</para>146</para>
147147
148<para arch="s390">
149A paragraph only interesting for Linux/s390 users.
150</para>
151
152<para arch="not-s390">
153A paragraph not interesting for Linux/s390 users.
154</para>
155
148<sect3 condition="bootable-from-hard-disk">156<sect3 condition="bootable-from-hard-disk">
149A section pertaining only to computers which157A section pertaining only to computers which
150can boot from their hard disk.158can boot from their hard disk.
151159
=== 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 @@
74# swapon /dev/<replaceable>sda5</replaceable>74# swapon /dev/<replaceable>sda5</replaceable>
75</screen></informalexample>75</screen></informalexample>
7676
77<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>
78
77Mount one partition as <filename>/mnt/ubuntu</filename> (the79Mount one partition as <filename>/mnt/ubuntu</filename> (the
78installation point, to be the root (<filename>/</filename>) filesystem80installation point, to be the root (<filename>/</filename>) filesystem
79on your new system). The mount point name is strictly arbitrary, it is81on your new system). The mount point name is strictly arbitrary, it is
@@ -113,6 +115,7 @@
113</footnote>. Install <command>wget</command> and115</footnote>. Install <command>wget</command> and
114<command>ar</command> if they aren't already on your current system,116<command>ar</command> if they aren't already on your current system,
115then download and install <command>debootstrap</command>.117then download and install <command>debootstrap</command>.
118If these steps are executed under &debian; you can simply do this by <userinput>apt install debootstrap</userinput>.
116119
117</para>120</para>
118121
@@ -209,7 +212,56 @@
209Depending on the value of TERM, you may have to install the212Depending on the value of TERM, you may have to install the
210<classname>ncurses-term</classname> package to get support for it.213<classname>ncurses-term</classname> package to get support for it.
211214
212</para>215<note><para>
216If warnings occur like:
217<informalexample><screen>
218bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
219</screen></informalexample>
220The required localization files need to be generated:
221<informalexample><screen>
222# sudo locale-gen en_US.UTF-8
223Generating locales (this might take a while)...
224 en_US.UTF-8... done
225Generation complete.
226</screen></informalexample>
227</para></note>
228
229</para>
230
231 <sect3>
232 <title>Configure Apt</title>
233<para>
234
235Debootstrap will have created a very basic <filename>/etc/apt/sources.list</filename> that will allow installing
236additional packages. However, it is suggested that you add some additional sources,
237for example for source packages and security updates:
238</para><para>
239<informalexample><screen>
240deb-src http://archive.ubuntu.com/ubuntu &releasename; main
241
242deb http://security.ubuntu.com/ubuntu &releasename;-security main
243deb-src http://security.ubuntu.com/ubuntu &releasename;-security main
244</screen></informalexample>
245</para><para>
246Make sure to run <userinput>apt update</userinput> after you have
247made changes to the sources list.
248
249</para>
250 </sect3>
251
252
253 <sect3>
254 <title>Install additional packages</title>
255<para>
256
257Now it's required to install some additionally required packages, like makedev (needed for the next section):
258<userinput>apt install makedev</userinput>
259
260</para><para arch="s390">
261Or in case using the &architecture; architecture the mandatory s390-tools package: <userinput>apt install s390-tools</userinput>
262
263</para>
264 </sect3>
213265
214 <sect3>266 <sect3>
215 <title>Create device files</title>267 <title>Create device files</title>
@@ -230,13 +282,14 @@
230<itemizedlist>282<itemizedlist>
231<listitem><para>283<listitem><para>
232284
233install the makedev package, and create a default set of static device files285create a default set of static device files using (after chrooting)
234using (after chrooting)
235<informalexample><screen>286<informalexample><screen>
236# apt-get install makedev
237# mount none /proc -t proc287# mount none /proc -t proc
238# cd /dev288# cd /dev
239# MAKEDEV generic289# MAKEDEV generic
290or depending on your specific architecture:
291# MAKEDEV std
292# cd ..
240</screen></informalexample>293</screen></informalexample>
241294
242</para></listitem>295</para></listitem>
@@ -244,12 +297,72 @@
244297
245manually create only specific device files using <command>MAKEDEV</command>298manually create only specific device files using <command>MAKEDEV</command>
246299
300</para><para arch="s390">
301On &architecture; the DASD devices need to be created this way:
302<informalexample><screen>
303# cd /dev
304# MAKEDEV dasd
305# cd ..
306</screen></informalexample>
307
247</para></listitem>308</para></listitem>
309<!-- this is an alternate method to create DASD devices -->
310<!-- <listitem arch="s390"><para>
311
312If using DASD devices a manual creation of the device node(s) might be needed.
313For 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):
314Find this out on your host system with:
315<informalexample><screen>
316$ cat /proc/dasd/devices | grep dasdb
3170.0.260b(ECKD) at ( 94: 12) is dasdb : active at blocksize: 4096, 1803060 blocks, 7043 MB
318</screen></informalexample>
319
320With that the device nodes and partitions entries can be created:
321<informalexample><screen>
322# mknod -m 660 /dev/dasdb b 94 12
323# mknod -m 660 /dev/dasdb1 b 94 12
324# ls -l /dev/dasd*
325brw-rw - - - - 1 root root 94, 12 Jun 20 04:45 /dev/dasdb
326brw-rw - - - - 1 root root 94, 12 Jun 20 04:46 /dev/dasdb1
327</screen></informalexample>
328
329It's recommended to do a quick check if the partition is accessible by:
330<informalexample><screen>
331# fdasd -ps /dev/dasdb
332 /dev/dasdb1 2 150254 150253 1 Linux native
333</screen></informalexample>
334</para></listitem> -->
335
248<listitem><para>336<listitem><para>
249337
250bind mount /dev from your host system on top of /dev in the target system;338bind mount /dev from your host system on top of /dev in the target system, like:
251note that the postinst scripts of some packages may try to create device339<informalexample><screen>
252files, so this option should only be used with care340mount --bind dev /dev
341</screen></informalexample>
342Note that the postinst scripts of some packages may try to create device files,
343so this option should only be used with care.
344
345</para></listitem>
346<listitem arch="s390"><para>
347mount proc and sysfs
348</para><para>
349You can mount the proc and sysfs file systems multiple times and to arbitrary
350locations, though <filename>/proc</filename> and <filename>/sys</filename> respectively are customary.
351
352<informalexample><screen>
353# mount -t proc proc /proc
354# mount -t sysfs sysfs /sys
355</screen></informalexample>
356
357</para><para>
358
359The command <userinput>ls /proc</userinput> should now show a non-empty
360directory. Should this fail, you may be able to mount proc from outside
361the chroot:
362
363<informalexample><screen>
364# mount -t proc proc /mnt/ubuntu/proc
365</screen></informalexample>
253366
254</para></listitem>367</para></listitem>
255</itemizedlist>368</itemizedlist>
@@ -257,6 +370,37 @@
257</para>370</para>
258 </sect3>371 </sect3>
259372
373 <sect3 arch="s390">
374 <title>DASD Disks and Partitions</title>
375<para>
376Even if <command>lsdasd</command> already lists DASD devices:
377<informalexample><screen>
378# lsdasd
379Bus-ID Status Name Device Type BlkSz Size Blocks
380==============================================================================
3810.0.1601 active dasda 94:0 ECKD 4096 7043MB 1803060
3820.0.260a active dasdb 94:4 ECKD 4096 7043MB 1803060
383</screen></informalexample>
384...they - and other CCW devices like DASD, FCP oder QETH devices as well - cannot be fully and persistently used, yet.
385<informalexample><screen>
386# lszdev --online | head -n 1 &amp;&amp; lszdev --online | grep dasd-eckd
387TYPE ID ON PERS NAMES
388dasd-eckd 0.0.0123 yes no dasda
389dasd-eckd 0.0.1234 yes no dasdb
390</screen></informalexample>
391Here DASD 1234 is the one used for debootstrap.
392Now make this particular DASD persistently active with the help of the usual <command>chzdev</command> tool:
393<informalexample><screen>
394# chzdev -e 1234
395ECKD DASD 0.0.1234 configured
396# lszdev --online 1234
397TYPE ID ON PERS NAMES
398dasd-eckd 0.0.1234 yes yes dasdb
399</screen></informalexample>
400Repeat similar steps for other CCW devices, like FCP, QETH devices or further DASD devices - if needed.
401</para>
402 </sect3>
403
260 <sect3>404 <sect3>
261 <title>Mount Partitions</title>405 <title>Mount Partitions</title>
262<para>406<para>
@@ -269,7 +413,7 @@
269413
270Here is a sample you can modify to suit:414Here is a sample you can modify to suit:
271415
272<informalexample><screen>416<informalexample arch="not-s390"><screen>
273# /etc/fstab: static file system information.417# /etc/fstab: static file system information.
274#418#
275# file system mount point type options dump pass419# file system mount point type options dump pass
@@ -289,6 +433,17 @@
289/dev/XXX /home ext3 rw,nosuid,nodev 0 2433/dev/XXX /home ext3 rw,nosuid,nodev 0 2
290</screen></informalexample>434</screen></informalexample>
291435
436<informalexample arch="s390"><screen>
437# /etc/fstab: static file system information.
438# hand-crafted
439# file system mount point type options dump pass
440#
441/dev/dasdb1 / ext4 defaults 0 1
442
443/swapfile none swap sw 0 0
444</screen></informalexample>
445
446
292Use <userinput>mount -a</userinput> to mount all the file systems you447Use <userinput>mount -a</userinput> to mount all the file systems you
293have specified in your <filename>/etc/fstab</filename>, or, to mount448have specified in your <filename>/etc/fstab</filename>, or, to mount
294file systems individually, use:449file systems individually, use:
@@ -309,6 +464,8 @@
309# ln -s media/cdrom464# ln -s media/cdrom
310</screen></informalexample>465</screen></informalexample>
311466
467</para><para arch="not-s390">
468
312You can mount the proc and sysfs file systems multiple times and to arbitrary469You can mount the proc and sysfs file systems multiple times and to arbitrary
313locations, though <filename>/proc</filename> and <filename>/sys</filename> respectively are customary. If you didn't use470locations, though <filename>/proc</filename> and <filename>/sys</filename> respectively are customary. If you didn't use
314<userinput>mount -a</userinput>, be sure to mount proc and sysfs before continuing:471<userinput>mount -a</userinput>, be sure to mount proc and sysfs before continuing:
@@ -365,7 +522,7 @@
365<para>522<para>
366523
367To configure networking, edit524To configure networking, edit
368<filename>/etc/network/interfaces</filename>,525<filename>/etc/network/interfaces</filename>, <!-- FIXME: may need to be adapted to netplan for Ubuntu -->
369<filename>/etc/resolv.conf</filename>,526<filename>/etc/resolv.conf</filename>,
370<filename>/etc/hostname</filename> and527<filename>/etc/hostname</filename> and
371<filename>/etc/hosts</filename>.528<filename>/etc/hosts</filename>.
@@ -450,28 +607,6 @@
450 </sect3>607 </sect3>
451608
452 <sect3>609 <sect3>
453 <title>Configure Apt</title>
454<para>
455
456Debootstrap will have created a very basic
457<filename>/etc/apt/sources.list</filename> that will allow installing
458additional packages. However, it is suggested that you add some additional sources,
459for example for source packages and security updates:
460
461<informalexample><screen>
462deb-src http://archive.ubuntu.com/ubuntu &releasename; main
463
464deb http://security.ubuntu.com/ubuntu &releasename;-security main
465deb-src http://security.ubuntu.com/ubuntu &releasename;-security main
466</screen></informalexample>
467
468Make sure to run <userinput>aptitude update</userinput> after you have
469made changes to the sources list.
470
471</para>
472 </sect3>
473
474 <sect3>
475 <title>Configure Locales and Keyboard</title>610 <title>Configure Locales and Keyboard</title>
476<para>611<para>
477612
@@ -480,13 +615,13 @@
480Currently the use of UTF-8 locales is recommended.615Currently the use of UTF-8 locales is recommended.
481616
482<informalexample><screen>617<informalexample><screen>
483# aptitude install language-pack-de language-pack-gnome-de618# apt install language-pack-de language-pack-gnome-de
484</screen></informalexample>619</screen></informalexample>
485620
486To configure your keyboard (if needed):621To configure your keyboard (if needed):
487622
488<informalexample><screen>623<informalexample><screen>
489# aptitude install console-setup624# apt install console-setup
490# dpkg-reconfigure keyboard-configuration 625# dpkg-reconfigure keyboard-configuration
491</screen></informalexample>626</screen></informalexample>
492627
@@ -515,8 +650,9 @@
515Then install the kernel package of your choice using its package name.650Then install the kernel package of your choice using its package name.
516651
517<informalexample><screen>652<informalexample><screen>
518# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>653# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>
519</screen></informalexample>654</screen></informalexample>
655(You may want install <filename>linux-image-generic</filename>, too.)
520656
521</para>657</para>
522 </sect2>658 </sect2>
@@ -528,7 +664,7 @@
528To make your &debian-gnu; system bootable, set up your boot loader to load664To make your &debian-gnu; system bootable, set up your boot loader to load
529the installed kernel with your new root partition. Note that665the installed kernel with your new root partition. Note that
530<command>debootstrap</command> does not install a boot loader, though you666<command>debootstrap</command> does not install a boot loader, though you
531can use <command>aptitude</command> inside your &debian; chroot to do so.667can use <command>apt</command> inside your &debian; chroot to do so.
532668
533</para><para arch="any-x86">669</para><para arch="any-x86">
534670
@@ -552,7 +688,7 @@
552Installing and setting up <classname>grub2</classname> is as easy as:688Installing and setting up <classname>grub2</classname> is as easy as:
553689
554<informalexample><screen>690<informalexample><screen>
555# aptitude install grub-pc691# apt install grub-pc
556# grub-install /dev/<replaceable>sda</replaceable>692# grub-install /dev/<replaceable>sda</replaceable>
557# update-grub693# update-grub
558</screen></informalexample>694</screen></informalexample>
@@ -561,7 +697,7 @@
561the MBR of <literal>sda</literal>). The last command will create a sane697the MBR of <literal>sda</literal>). The last command will create a sane
562and working <filename>/boot/grub/grub.cfg</filename>.698and working <filename>/boot/grub/grub.cfg</filename>.
563699
564</para><para>700</para><para arch="not-s390">
565701
566Note that this assumes that a <filename>/dev/sda</filename> device file has702Note that this assumes that a <filename>/dev/sda</filename> device file has
567been created. There are alternative methods to install <command>grub2</command>,703been created. There are alternative methods to install <command>grub2</command>,
@@ -610,6 +746,55 @@
610On some machines, you may need to use <userinput>ide0:</userinput>746On some machines, you may need to use <userinput>ide0:</userinput>
611instead of <userinput>hd:</userinput>.747instead of <userinput>hd:</userinput>.
612748
749</para><para arch="s390">
750The <quote>zipl</quote> bootloader is part of the <quote>s390-tools</quote> package that was installed earlier.
751Check <userinput>man zipl.conf</userinput> for instructions on setting up the bootloader.
752Either create a <filename>zipl.conf</filename> configuration from scratch or copy over and modify the existing one.
753
754</para><para arch="s390">
755
756Here is a basic <filename>/etc/zipl.conf</filename> as an example:
757
758<informalexample><screen>
759[defaultboot]
760defaultmenu = menu
761
762:menu
763target = /boot
7641 = ubuntu
765default = 1
766
767[ubuntu]
768target = /boot
769image = /boot/vmlinuz
770ramdisk = /boot/initrd.img
771parameters = root=/dev/dasdb1
772</screen></informalexample>
773
774Since the <filename>kernel</filename> and <filename>initrd</filename> filesnames in <filename>/boot</filename> are versioned,
775it's recommended to link them to non-versioned default names, like:
776<informalexample><screen>
777# ln -s /boot/vmlinuz-4.15.0-23-generic /boot/vmlinuz
778# ln -s /boot/initrd.img-4.15.0-23-generic /boot/initrd.img
779
780# ls -la /boot/vmlinuz* /boot/initrd.img*
781lrwxrwxrwx 1 root root 28 Jun 20 07:31 /boot/initrd.img -> initrd.img-&lt;version&gt;-generic
782-rw-r--r-- 1 root root 11245088 Jun 20 07:14 /boot/initrd.img-&lt;version&gt;-generic
783lrwxrwxrwx 1 root root 25 Jun 20 07:31 /boot/vmlinuz -> vmlinuz-&lt;version&gt;-generic
784-rw------- 1 root root 4390912 May 23 12:54 /boot/vmlinuz-&lt;version&gt;-generic
785</screen></informalexample>
786
787Finally don't forget to execute the <command>zipl</command> command for writing the configuration to disk:
788<informalexample><screen>
789# zipl
790Using config file '/etc/zipl.conf'
791Building bootmap in '/boot'
792Building menu 'menu'
793Adding #1: IPL section 'ubuntu' (default)
794Preparing boot device: dasdb (&lt;your dasd device number&gt;).
795Done.
796</screen></informalexample>
797
613</para>798</para>
614 </sect2>799 </sect2>
615800
@@ -622,10 +807,9 @@
622SSH and set up access.807SSH and set up access.
623808
624<informalexample><screen>809<informalexample><screen>
625# aptitude install ssh810# apt install openssh-server <!-- FIXME: was formerly 'ssh' - no condition available to limit text to ubuntu-only or not-debian -->
626</screen></informalexample>811</screen></informalexample>
627812
628
629Root login with password is disabled by default, so setting up access can be813Root login with password is disabled by default, so setting up access can be
630done by setting a password and re-enable root login with password:814done by setting a password and re-enable root login with password:
631815
@@ -667,10 +851,11 @@
667to install all packages with <quote>standard</quote> priority:851to install all packages with <quote>standard</quote> priority:
668852
669<informalexample><screen>853<informalexample><screen>
854# apt install tasksel
670# tasksel install standard855# tasksel install standard
671</screen></informalexample>856</screen></informalexample>
672857
673Of course, you can also just use <command>aptitude</command> to install858Of course, you can also just use <command>apt</command> to install
674packages individually.859packages individually.
675860
676</para><para>861</para><para>
@@ -680,7 +865,7 @@
680diskspace by running:865diskspace by running:
681866
682<informalexample><screen>867<informalexample><screen>
683# aptitude clean868# apt clean
684</screen></informalexample>869</screen></informalexample>
685870
686</para>871</para>
687872
=== 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 @@
1616
17</para><para>17</para><para>
1818
19<informaltable><tgroup cols="2"><tbody>19<informaltable arch="not-s390"><tgroup cols="2"><tbody>
20<row>20<row>
21 <entry><filename>fd0</filename></entry>21 <entry><filename>fd0</filename></entry>
22 <entry>First Floppy Drive</entry>22 <entry>First Floppy Drive</entry>
@@ -29,20 +29,36 @@
29<informaltable><tgroup cols="2"><tbody>29<informaltable><tgroup cols="2"><tbody>
30<row>30<row>
31 <entry><filename>sda</filename></entry>31 <entry><filename>sda</filename></entry>
32 <entry>First hard disk</entry>32 <entry>First <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
33</row><row>33</row><row>
34 <entry><filename>sdb</filename></entry>34 <entry><filename>sdb</filename></entry>
35 <entry>Second hard disk</entry>35 <entry>Second <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
36</row><row>36</row><row>
37 <entry><filename>sda1</filename></entry>37 <entry><filename>sda1</filename></entry>
38 <entry>First partition of the first hard disk</entry>38 <entry>First partition of the first <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
39</row><row>39</row><row>
40 <entry><filename>sdb7</filename></entry>40 <entry><filename>sdb7</filename></entry>
41 <entry>Seventh partition of the second hard disk</entry>41 <entry>Seventh partition of the second <phrase arch="s390">SCSI/FCP </phrase>hard disk</entry>
42</row>42</row>
43</tbody></tgroup></informaltable>43</tbody></tgroup></informaltable>
4444
45<informaltable><tgroup cols="2"><tbody>45<informaltable arch="s390"><tgroup cols="2"><tbody>
46<row>
47 <entry><filename>dasda</filename></entry>
48 <entry>First DASD disk</entry>
49</row><row>
50 <entry><filename>dasdb</filename></entry>
51 <entry>Second DASD disk</entry>
52</row><row>
53 <entry><filename>dasda1</filename></entry>
54 <entry>First partition of the first DASD disk</entry>
55</row><row>
56 <entry><filename>dasdb7</filename></entry>
57 <entry>Seventh partition of the second DASD disk</entry>
58</row>
59</tbody></tgroup></informaltable>
60
61<informaltable arch="not-s390"><tgroup cols="2"><tbody>
46<row>62<row>
47 <entry><filename>sr0</filename></entry>63 <entry><filename>sr0</filename></entry>
48 <entry>First CD-ROM</entry>64 <entry>First CD-ROM</entry>
@@ -52,7 +68,7 @@
52</row>68</row>
53</tbody></tgroup></informaltable>69</tbody></tgroup></informaltable>
5470
55<informaltable><tgroup cols="2"><tbody>71<informaltable arch="not-s390"><tgroup cols="2"><tbody>
56<row>72<row>
57 <entry><filename>ttyS0</filename></entry>73 <entry><filename>ttyS0</filename></entry>
58 <entry>Serial port 0, COM1 under MS-DOS</entry>74 <entry>Serial port 0, COM1 under MS-DOS</entry>
@@ -71,8 +87,8 @@
71<informaltable><tgroup cols="2"><tbody>87<informaltable><tgroup cols="2"><tbody>
72<row>88<row>
73 <entry><filename>cdrom</filename></entry>89 <entry><filename>cdrom</filename></entry>
74 <entry>Symbolic link to the CD-ROM drive</entry>90 <entry>Symbolic link to the <phrase arch="s390">(virtual) </phrase>CD-ROM drive</entry>
75</row><row>91</row><row arch="not-s390">
76 <entry><filename>mouse</filename></entry>92 <entry><filename>mouse</filename></entry>
77 <entry>Symbolic link to the mouse device file</entry>93 <entry>Symbolic link to the mouse device file</entry>
78</row>94</row>
@@ -176,10 +192,10 @@
176 <title>Disk Space Needed for Tasks</title>192 <title>Disk Space Needed for Tasks</title>
177<para>193<para>
178194
179A standard installation for the amd64 architecture, including all standard195A standard installation for the <phrase arch="not-s390">amd64</phrase><phrase arch="s390">&architecture;</phrase> architecture, including all standard
180packages and using the default kernel, takes up &std-system-size;MB of disk space.196packages 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.
181A minimal base installation, without the <quote>Standard system</quote>197A minimal base installation, without the <quote>Basic &debian; server</quote>
182task selected, will take &base-system-size;MB.198task selected, will take <phrase arch="not-s390">&base-system-size;</phrase><phrase arch="s390">&base-system-size-s390x;</phrase>MB.
183199
184</para>200</para>
185<important><para>201<important><para>
@@ -315,9 +331,9 @@
315 <title>Disk Space Needed</title>331 <title>Disk Space Needed</title>
316<para>332<para>
317333
318A minimal server installation of &releasename; requires 400MB of disk space.334A minimal server installation of &releasename; requires <phrase arch="not-s390">400MB</phrase><phrase arch="s390">1.1GB</phrase> of disk space.
319<phrase condition="supports-desktop">The standard Ubuntu desktop installation335<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>
320requires 2GB.</phrase>336<phrase condition="supports-desktop">The standard Ubuntu desktop installation requires 2GB.</phrase>
321337
322</para>338</para>
323 </sect1>339 </sect1>
324340
=== 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 @@
72</thead>72</thead>
7373
74<tbody>74<tbody>
75<row>75<row arch="s390">
76 <entry>CD/DVD</entry>76 <entry>generic (network install)</entry>
77 <entry>yes</entry>
78 <entry>no</entry>
79 <entry>yes</entry>
80</row><row>
81 <entry>CD/DVD
82 <footnote arch="s390" id='load-from-removable-media'>
83 <para>
84 can be done with the help of the HMC task <guimenuitem>Load from Removable Media or Server</guimenuitem>.
85 On &architecture; this is not comparable to other architectures and technically close to a <quote>generic (network install)</quote>.
86 </para>
87 </footnote>
88 </entry>
77 <entry>yes</entry>89 <entry>yes</entry>
78 <entry>yes</entry>90 <entry>yes</entry>
79 <entry>yes<footnote id='apx-ps-net'>91 <entry>yes<footnote id='apx-ps-net'>
80
81 <para>92 <para>
82 but only if you have network access, and set <literal>preseed/url</literal>93 but only if you have network access, and set <literal>preseed/url</literal>
83 appropriately94 appropriately
84 </para>95 </para>
8596 </footnote>
86 </footnote></entry>97 </entry>
87</row><row>98</row><row arch="not-s390">
88 <entry>netboot</entry>99 <entry>netboot</entry>
89 <entry>yes</entry>100 <entry>yes</entry>
90 <entry>no</entry>101 <entry>no</entry>
91 <entry>yes</entry>102 <entry>yes</entry>
92</row><row>103</row><row arch="not-s390">
93 <entry>hd-media <phrase condition="bootable-usb">(including usb-stick)</phrase></entry>104 <entry>hd-media <phrase condition="bootable-usb">(including usb-stick)</phrase></entry>
94 <entry>yes</entry>105 <entry>yes</entry>
95 <entry>yes</entry>106 <entry>yes</entry>
96 <entry>yes<footnoteref linkend="apx-ps-net"/></entry>107 <entry>yes<footnoteref linkend="apx-ps-net"/></entry>
108</row><row arch="s390">
109 <entry>USB drive<footnoteref linkend="load-from-removable-media"/></entry>
110 <entry>yes</entry>
111 <entry>yes</entry>
112 <entry>yes</entry>
97</row><row condition="supports-floppy-boot">113</row><row condition="supports-floppy-boot">
98 <entry>floppy based (cd-drivers)</entry>114 <entry>floppy based (cd-drivers)</entry>
99 <entry>yes</entry>115 <entry>yes</entry>
@@ -104,11 +120,6 @@
104 <entry>yes</entry>120 <entry>yes</entry>
105 <entry>no</entry>121 <entry>no</entry>
106 <entry>yes</entry>122 <entry>yes</entry>
107</row><row arch="s390">
108 <entry>generic</entry>
109 <entry>yes</entry>
110 <entry>no</entry>
111 <entry>yes</entry>
112</row>123</row>
113</tbody>124</tbody>
114125
@@ -135,7 +146,8 @@
135questions from being asked is to preseed them through the boot parameters,146questions from being asked is to preseed them through the boot parameters,
136as described in <xref linkend="preseed-bootparms"/>.147as described in <xref linkend="preseed-bootparms"/>.
137148
138</para><para>149</para></important>
150<important><para>
139151
140In order to easily avoid the questions that would normally appear before the152In order to easily avoid the questions that would normally appear before the
141preseeding occurs, you can start the installer in <quote>auto</quote>153preseeding occurs, you can start the installer in <quote>auto</quote>
@@ -256,17 +268,21 @@
256</para><para>268</para><para>
257269
258For the other preseeding methods you need to tell the installer what file270For the other preseeding methods you need to tell the installer what file
259to use when you boot it. This is normally done by passing the kernel a boot271to use when you boot it. This is normally done <phrase arch="not-s390">by passing the kernel a boot
260parameter, either manually at boot time or by editing the bootloader272parameter, either manually at boot time or</phrase> by editing the bootloader
261configuration file <phrase arch="linux-any">(e.g.273configuration file <phrase arch="any-86"> <!-- changed from linux-any to any-x86 -->
262<filename>syslinux.cfg</filename>) and adding the parameter to the end of274(e.g. <filename>syslinux.cfg</filename>) and adding the parameter to the end of
263the append line(s) for the kernel.</phrase><phrase arch="kfreebsd-any">(e.g.275the append line(s) for the kernel.</phrase>
264<filename>grub.cfg</filename>) and adding the parameter as a new276<phrase arch="kfreebsd-any">(e.g. <filename>grub.cfg</filename>) and adding the parameter as a new
265<literal>set</literal> line for the kernel.</phrase><phrase arch="hurd-any">(e.g.277<literal>set</literal> line for the kernel.</phrase>
278<phrase arch="hurd-any">(e.g.
266<filename>grub.cfg</filename>) and adding the parameter to the end of the279<filename>grub.cfg</filename>) and adding the parameter to the end of the
267<filename>gnumach.gz</filename> line.</phrase>280<filename>gnumach.gz</filename> line.</phrase>
268281
269</para><para>282<phrase arch="s390">(e.g.
283<filename>parmfile.&debian-lc;</filename>) and adding the parameter to the end (however, the file is empty by default).</phrase>
284
285</para><para arch="not-s390">
270286
271If you do specify the preconfiguration file in the bootloader configuration,287If you do specify the preconfiguration file in the bootloader configuration,
272you might change the configuration so you don't need to hit enter to boot the288you might change the configuration so you don't need to hit enter to boot the
@@ -282,21 +298,28 @@
282md5sum, and if specified it must match the preconfiguration file or the298md5sum, and if specified it must match the preconfiguration file or the
283installer will refuse to use it.299installer will refuse to use it.
284300
285</para>301</para><para>
286
287<informalexample><screen>
288Boot parameters to specify:302Boot parameters to specify:
303</para>
304<informalexample><screen>
289- if you're netbooting:305- if you're netbooting:
290 preseed/url=http://host/path/to/preseed.cfg306 preseed/url=http://host/path/to/preseed.cfg
291 preseed/url/checksum=5da499872becccfeda2c4872f9171c3d307 preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
292- or308- or
309 preseed/url=ftp://host/path/to/preseed.cfg
310 preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
311- or
293 preseed/url=tftp://host/path/to/preseed.cfg312 preseed/url=tftp://host/path/to/preseed.cfg
294 preseed/url/checksum=5da499872becccfeda2c4872f9171c3d313 preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
314</screen></informalexample>
295315
296- if you're booting a remastered CD:316<informalexample><screen>
317- if you're booting a remastered CD or image:
297 preseed/file=/cdrom/preseed.cfg318 preseed/file=/cdrom/preseed.cfg
298 preseed/file/checksum=5da499872becccfeda2c4872f9171c3d319 preseed/file/checksum=5da499872becccfeda2c4872f9171c3d
320</screen></informalexample>
299321
322<informalexample arch="not-s390"><screen>
300- if you're installing from USB media (put the preconfiguration file in the323- if you're installing from USB media (put the preconfiguration file in the
301 toplevel directory of the USB stick):324 toplevel directory of the USB stick):
302 preseed/file=/hd-media/preseed.cfg325 preseed/file=/hd-media/preseed.cfg
@@ -333,18 +356,13 @@
333<userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>356<userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
334for any of the preseed variables listed in the examples in this appendix.357for any of the preseed variables listed in the examples in this appendix.
335If a value is to be used to configure packages for the target system, you358If a value is to be used to configure packages for the target system, you
336will need to prepend the <firstterm>owner</firstterm><footnote>359will need to prepend the <firstterm>owner</firstterm><footnote><para>
337
338<para>
339The owner of a debconf variable (or template) is normally the name of the360The owner of a debconf variable (or template) is normally the name of the
340package that contains the corresponding debconf template. For variables361package that contains the corresponding debconf template. For variables
341used in the installer itself the owner is <quote>d-i</quote>.362used in the installer itself the owner is <quote>d-i</quote>.
342Templates and variables can have more than one owner which helps to363Templates and variables can have more than one owner which helps to
343determine whether they can be removed from the debconf database if the364determine whether they can be removed from the debconf database if the
344package is purged.365package is purged.</para></footnote> of the variable as in
345</para>
346
347</footnote> of the variable as in
348<userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>.366<userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>.
349If you don't specify the owner, the value for the variable will not be367If you don't specify the owner, the value for the variable will not be
350copied to the debconf database in the target system and thus remain unused368copied to the debconf database in the target system and thus remain unused
@@ -366,7 +384,7 @@
366<literal>url</literal>. Another example is the <literal>tasks</literal>384<literal>url</literal>. Another example is the <literal>tasks</literal>
367alias, which translates to <literal>tasksel:tasksel/first</literal>.385alias, which translates to <literal>tasksel:tasksel/first</literal>.
368386
369</para><para>387</para><para arch="not-s390">
370388
371A <quote>---</quote> in the boot options has special meaning. Kernel389A <quote>---</quote> in the boot options has special meaning. Kernel
372parameters that appear after the last <quote>---</quote> may be copied390parameters that appear after the last <quote>---</quote> may be copied
@@ -383,10 +401,20 @@
383(crash). (For earlier kernels, these numbers were lower.)401(crash). (For earlier kernels, these numbers were lower.)
384402
385</para></note>403</para></note>
404
405<note arch="s390"><para>
406
407The &debian-lc;.parmfile is limited to 11 lines only, each 80 characters long.
408(The precise limit is 11 lines with each * 80 characters plus additional 10 characters.)
409Hence 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!
410The case of the parameter as well as the sequence don't matter.
411
412</para></note>
413
386<para>414<para>
387415
388For most installations some of the default options in your bootloader416For most installations some of the default options in your bootloader
389configuration file, like <literal>vga=normal</literal>, may be safely417configuration file<phrase arch="not-s390">, like <literal>vga=normal</literal>,</phrase> may be safely
390removed which may allow you to add more options for preseeding.418removed which may allow you to add more options for preseeding.
391419
392</para>420</para>
@@ -402,7 +430,7 @@
402 <title>Auto mode</title>430 <title>Auto mode</title>
403<para>431<para>
404432
405There are several features of &debian; Installer that combine to allow433There are several features of the &debian; Installer that combine to allow
406fairly simple command lines at the boot prompt to result in434fairly simple command lines at the boot prompt to result in
407arbitrarily complex customized automatic installs.435arbitrarily complex customized automatic installs.
408436
@@ -507,10 +535,10 @@
507535
508</para><para>536</para><para>
509537
510The <literal>auto</literal> boot choice is not yet defined on all arches.538The <literal>auto</literal> boot choice is not yet defined on all arches<phrase arch="s390"> (like on &architecture;)</phrase>,
511The same effect may be achieved by simply adding the two539but the same effect may be achieved by simply adding the two
512parameters <literal>auto=true priority=critical</literal> to the kernel540parameters <literal>auto=true priority=critical</literal> to the kernel command line.
513command line. The <literal>auto</literal> kernel parameter is an alias for541The <literal>auto</literal> kernel parameter is an alias for
514<literal>auto-install/enable</literal> and setting it to542<literal>auto-install/enable</literal> and setting it to
515<literal>true</literal> delays the543<literal>true</literal> delays the
516locale and keyboard questions until after there has been a chance to544locale and keyboard questions until after there has been a chance to
@@ -599,14 +627,15 @@
599}627}
600</screen></informalexample>628</screen></informalexample>
601629
602<para>630<note><para>
603631
604Note that the above example limits this filename to DHCP clients that identify632The above example limits this filename to DHCP clients that identify
605themselves as "d-i", so it will not affect regular DHCP clients, but only633themselves as "d-i", so it will not affect regular DHCP clients, but only
606the installer. You can also put the text in a stanza for only one particular634the installer. You can also put the text in a stanza for only one particular
607host to avoid preseeding all installs on your network.635host to avoid preseeding all installs on your network.
608636
609</para><para>637</para></note>
638<para>
610639
611A good way to use the DHCP preseeding is to only preseed values specific to640A good way to use the DHCP preseeding is to only preseed values specific to
612your network, such as the &debian; mirror to use. This way installs on your641your network, such as the &debian; mirror to use. This way installs on your
@@ -880,9 +909,13 @@
880# netcfg will choose an interface that has link if possible. This makes it909# netcfg will choose an interface that has link if possible. This makes it
881# skip displaying a list if there is more than one interface.910# skip displaying a list if there is more than one interface.
882d-i netcfg/choose_interface select auto911d-i netcfg/choose_interface select auto
883912<phrase arch="not-s390"># To pick a particular interface instead:
884# To pick a particular interface instead:913#d-i netcfg/choose_interface select eth1</phrase>
885#d-i netcfg/choose_interface select eth1914<phrase arch="s390"># Activate QETH devices (&architecture;-specific OSA adapters or Hipersockets)
915#d-i s390-netdevice/choose_networktype string qeth
916#d-i s390-netdevice/qeth/choose string 0.0.c000-0.0.c001-0.0.c002
917#d-i s390-netdevice/qeth/layer2 boolean true
918#d-i s390-netdevice/qeth/port string 0</phrase>
886919
887# To set a different link detection timeout (default is 3 seconds).920# To set a different link detection timeout (default is 3 seconds).
888# Values are interpreted as seconds.921# Values are interpreted as seconds.
@@ -1124,6 +1157,29 @@
11241157
1125 </sect2>1158 </sect2>
11261159
1160 <sect2 id="s390-disk-storage">
1161 <title>&arch-title; specific disk storage</title>
1162
1163<para>
1164The &architecture; offers two unique kinds of disk storage - DASD and FCP (or zFCP).
1165
1166</para>
1167
1168<informalexample role="example"><screen>
1169# Activate DASD disks
1170#d-i s390-dasd/dasd string 0.0.0200,0.0.0300,0.0.0400
1171
1172# DASD configuration; by default dasdfmt (low-level format) if needed
1173#d-i s390-dasd/auto-format boolean true
1174#d-i s390-dasd/force-format boolean true
1175
1176# zFCP activation and configuration
1177# d-i s390-zfcp/zfcp string 0.0.1b34:0x400870075678a1b2:0x201480c800000000, \
1178# 0.0.1b34:0x400870075679a1b2:0x201480c800000000
1179</screen></informalexample>
1180
1181 </sect2>
1182
1127 <sect2 id="preseed-partman">1183 <sect2 id="preseed-partman">
1128 <title>Partitioning</title>1184 <title>Partitioning</title>
1129<para>1185<para>
@@ -1636,6 +1692,277 @@
1636</screen></informalexample>1692</screen></informalexample>
16371693
1638 </sect2>1694 </sect2>
1695
1696 <sect2 id="s390x-specific-preseed-details" arch="s390">
1697 <title>Further &arch-title;-specific Preseed Details</title>
1698
1699<para>
1700
1701Since the &architecture; comes with it's unique CCW IO-layer,
1702it's architecture-specific devices that are based uppon CCW require special preseed settings,
1703that have a <quote>s390-</quote> prefix.
1704But these settings can also be specified as boot parameters, in this case just without the prefix.
1705
1706</para><para>
1707
1708All &architecture;-specific preseed settings are prefixed with "s390-...".
1709</para><para>
1710With the help of these settings you can even preseed early questions like about the qeth network devices.
1711</para><para>
1712The 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>.
1713<!-- former link: https://anonscm.debian.org/cgit/d-i/ -->
1714</para><para>
1715Especially the following templates:
1716</para>
1717<itemizedlist><listitem><para>
1718QETH network devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-netdevice/blob/master/debian/s390-netdevice.templates">s390-netdevice Templates</ulink>
1719<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-netdevice.git/plain/debian/s390-netdevice.templates -->
1720</para></listitem>
1721<listitem><para>
1722DASD disk devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-dasd/blob/master/debian/s390-dasd.templates">s390-dasd Templates</ulink>
1723<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-dasd.git/plain/debian/s390-dasd.templates -->
1724</para></listitem>
1725<listitem><para>
1726zFCP disk devices, see: <ulink url="https://salsa.debian.org/installer-team/s390-zfcp/blob/master/debian/s390-zfcp.templates">s390-dasd Templates</ulink>
1727<!-- former link: https://anonscm.debian.org/cgit/d-i/s390-zfcp.git/plain/debian/s390-zfcp.templates -->
1728</para></listitem></itemizedlist>
1729
1730<para>
1731The following tables show the most relevant s390-specific boot parameters:
1732</para>
1733
1734<para>
1735Table: s390-netdevice parameters
1736<informaltable>
1737<tgroup cols="3">
1738<thead>
1739<row>
1740 <entry>Key</entry>
1741 <entry>Value</entry>
1742 <entry>Description</entry>
1743</row>
1744</thead>
1745<tbody>
1746<row>
1747 <entry>s390-netdevice/choose_networktype</entry>
1748 <entry>selection; choices: ctc, qeth, iucv, virtio</entry>
1749 <entry>Network device type</entry>
1750</row><row>
1751 <entry>s390-netdevice/ctc/protocol</entry>
1752 <entry>selection, choices: S/390 (0), Linux (1), OS/390 (3); default: S/390 (0)</entry>
1753 <entry>Protocol for this connection</entry>
1754</row><row>
1755 <entry>s390-netdevice/qeth/choose</entry>
1756 <entry>selection, choices: {choices}</entry>
1757 <entry>OSA-Express QDIO or Hipersockets device</entry>
1758</row><row>
1759 <entry>s390-netdevice/qeth/port</entry>
1760 <entry>string, default: 0</entry>
1761 <entry>Relative Port</entry>
1762</row><row>
1763 <entry>s390-netdevice/qeth/layer2</entry>
1764 <entry>boolean, default: false</entry>
1765 <entry>Device in layer2 mode</entry>
1766</row><row>
1767 <entry>s390-netdevice/iucv/peer</entry>
1768 <entry>string</entry>
1769 <entry>Name of VM peer</entry>
1770</row>
1771</tbody></tgroup></informaltable>
1772</para>
1773
1774<para>
1775Table: s390-dasd parameters
1776<informaltable>
1777<tgroup cols="3">
1778<thead>
1779<row>
1780 <entry>Key</entry>
1781 <entry>Value</entry>
1782 <entry>Description</entry>
1783</row>
1784</thead>
1785<tbody>
1786<row>
1787 <entry>s390-dasd/dasd</entry>
1788 <entry>string</entry>
1789 <entry>one or more DASD devices using comma ',' to separate multiple entries; complete dasd device number, incl. leading zeros, separated by dots '.'</entry>
1790</row><row>
1791 <entry>s390-dasd/auto_format</entry>
1792 <entry>boolean</entry>
1793 <entry>format DASD device automatically in case it is not low-level formatted</entry>
1794</row><row>
1795 <entry>s390-dasd/force_format</entry>
1796 <entry>boolean</entry>
1797 <entry>force DASD device format even in case it was already low-level formatted</entry>
1798</row>
1799</tbody></tgroup></informaltable>
1800</para>
1801
1802<para>
1803Table: s390-zfcp parameters
1804<informaltable>
1805<tgroup cols="3">
1806<thead>
1807<row>
1808 <entry>Key</entry>
1809 <entry>Value</entry>
1810 <entry>Description</entry>
1811</row>
1812</thead>
1813<tbody>
1814<row>
1815 <entry>s390-zfcp/zfcp</entry>
1816 <entry>string</entry>
1817 <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>
1818</row>
1819</tbody></tgroup></informaltable>
1820</para>
1821
1822 <sect3 id="s390x-preseed-example" arch="s390">
1823 <title>&arch-title; Preseed Example</title>
1824
1825<para>
1826
1827This example shows a typical preseed configuration for a &architecture; system.
1828In such environments static networks are more common that dynamic ones.
1829For 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.
1830
1831</para><para>
1832
1833The 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.
1834
1835</para><para>
1836
1837Here is a set of boot parameters that can be put into the <filename>&debian-lc;.parmfile</filename>.
1838It's using as much aliases as possible to keep it compact:
1839<informalexample role="example"><screen>
1840ro 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
1841</screen></informalexample>
1842
1843</para><para>
1844
1845In 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).
1846
1847</para><para>
1848
1849Especially 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.
1850
1851</para><para>
1852
1853IPv6 addresses of servers hosting preseed configuration files are possible.
1854
1855</para><para>
1856
1857The second part is the preseed.cfg file itself.
1858
1859<informalexample role="example"><screen>
1860#
1861# Sample s390x pressed with static qeth network and DASD disk
1862# fcp is included as comment
1863# ftp://server/preseed/preseed.cfg
1864#
1865
1866d-i debconf/priority string critical
1867d-i auto-install/enable boolean true
1868
1869# use -proposed udebs
1870d-i apt-setup/proposed boolean false
1871
1872d-i pkgsel/update-policy select unattended-upgrades
1873
1874# localization
1875d-i debian-installer/language string en
1876d-i debian-installer/country string US
1877d-i debian-installer/locale string en_US.UTF-8
1878
1879# activate qeth
1880d-i s390-netdevice/choose_networktype string qeth
1881d-i s390-netdevice/qeth/choose string 0.0.c000-0.0.c001-0.0.c002
1882d-i s390-netdevice/qeth/layer2 boolean true
1883d-i s390-netdevice/qeth/port string 0
1884
1885# use static network configuration
1886d-i netcfg/choose_interface select auto
1887d-i netcfg/disable_autoconfig boolean true
1888
1889d-i netcfg/get_ipaddress string 10.245.236.42
1890d-i netcfg/get_netmask string 255.255.255.0
1891d-i netcfg/get_gateway string 10.245.236.1
1892d-i netcfg/get_nameservers string 10.245.236.1
1893d-i netcfg/confirm_static boolean true
1894d-i netcfg/hostname string ZLIN42
1895
1896# provide network-console password
1897d-i network-console/password password pass4install
1898d-i network-console/password-again password pass4install
1899d-i network-console/start note
1900
1901# user setup
1902d-i passwd/user-fullname string ubuntu
1903d-i passwd/username string ubuntu
1904d-i passwd/user-password-crypted password $6czoUlkH40NHPJs5.5wdF.kIJFu33VdH0kNMTF$$$QFT6DumGdp5PNjlnnxowinu6tcztRC.
1905
1906d-i user-setup/encrypt-home boolean false
1907
1908# enable shadow passwords
1909d-i passwd/shadow boolean true
1910
1911# hw clock
1912d-i clock-setup/utc boolean true
1913# time zone
1914d-i time/zone string US/Eastern
1915
1916# release to install
1917d-i mirror/suite string bionic
1918
1919# do not enable live installer, use normal instead
1920d-i live-installer/enable boolean false
1921
1922# activate DASD, dasdfmt if needed
1923d-i s390-dasd/dasd string 0.0.0200,0.0.0300,0.0.0400
1924
1925# DASD configuration
1926d-i s390-dasd/auto-format boolean true
1927d-i s390-dasd/force-format boolean true
1928
1929# zFCP configuration
1930# d-i s390-zfcp/zfcp string
1931# 0.0.2b12:0x400807704798b4a4:0x201480c800000000
1932
1933# optional lines to overwrite old RAIDs and LVMs ....
1934# d-i partman-md/device_remove_md boolean true
1935# d-i partman-lvm/device_remove_lvm boolean true
1936# d-i partman-lvm/confirm boolean true
1937# d-i partman-lvm/confirm_nooverwrite boolean true
1938
1939# auto-partition, all files in one partition
1940d-i partman-auto/method string regular
1941d-i partman-auto/choose_recipe select atomic
1942d-i partman/choose_partition select finish
1943d-i partman/confirm_nooverwrite boolean true
1944d-i partman/confirm boolean true
1945
1946# software selection
1947d-i tasksel/first multiselect standard system utilities, OpenSSH server, Basic Ubuntu server
1948
1949# after installation, install some packages - use only one line!
1950d-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
1951
1952# reboot at the end
1953d-i finish-install/reboot_in_progress note
1954</screen></informalexample>
1955
1956Further excellent examples can be found at the
1957<ulink url="http://www.vm.ibm.com/education/lvc/zlinlvc.html">IBM Live Virtual Class</ulink> portal
1958in session <ulink url="http://www.vm.ibm.com/education/lvc/LVC0803.pdf">Fully Automated Installation of Ubuntu Server 16.04 with preseed</ulink>.
1959It 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.
1960</para>
1961
1962 </sect3>
1963
1964 </sect2>
1965
1639 </sect1>1966 </sect1>
16401967
16411968
@@ -1780,5 +2107,6 @@
1780</para>2107</para>
17812108
1782 </sect2>2109 </sect2>
2110
1783 </sect1>2111 </sect1>
1784</appendix>2112</appendix>
17852113
=== 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 @@
7flash chip on the device. The installer can be written to flash so it will7flash chip on the device. The installer can be written to flash so it will
8automatically start when you reboot your machines.8automatically start when you reboot your machines.
99
10</para><note><para>10</para>
11<note><para>
1112
12In most cases, changing the firmware of an embedded device voids your13In most cases, changing the firmware of an embedded device voids your
13warranty. Sometimes you are also not able to recover your device if there14warranty. Sometimes you are also not able to recover your device if there
1415
=== 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 @@
538successful, so that we can get as much information as possible on the largest538successful, so that we can get as much information as possible on the largest
539number of hardware configurations. 539number of hardware configurations.
540540
541</para><note condition="not-ubuntu"><para>541</para>
542<note condition="not-ubuntu"><para>
542543
543Your installation report will be published in the Debian Bug544Your installation report will be published in the Debian Bug
544Tracking System (BTS) and forwarded to a public mailing list. Make sure that545Tracking System (BTS) and forwarded to a public mailing list. Make sure that
545you use an e-mail address that you do not mind being made public.546you use an e-mail address that you do not mind being made public.
546547
547</para></note><para>548</para></note>
549<para>
548550
549If you have a working &debian; system, the easiest way to send an installation551If you have a working &debian; system, the easiest way to send an installation
550report is to install the <classname>installation-report</classname> and552report is to install the <classname>installation-report</classname> and
551553
=== 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 @@
1<!-- retain these comments for translator revision tracking -->
2<!-- $Id: disk-storage.xml 69111 2014-03-19 19:27:26Z merker $ -->
3
4 <sect2 id="disk-storage" arch="s390">
5 <title>Disk Storage on &arch-title;</title>
6<para>
7
8The &arch-title; platform provides two unique storage types:
9
10</para>
11
12<variablelist>
13 <varlistentry>
14
15 <term>DASD</term>
16 <listitem>
17
18 &module-s390-dasd.xml;
19
20 </listitem>
21
22 </varlistentry>
23 <varlistentry>
24
25 <term>FCP</term>
26
27 <listitem>
28
29 &module-s390-fcp.xml;
30
31 </listitem>
32 </varlistentry>
33</variablelist>
34
35 </sect2>
36
037
=== 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 @@
154-->154-->
155155
156<row condition="not-ubuntu">156<row condition="not-ubuntu">
157 <entry>64bit IBM S/390</entry>157 <entry>64bit IBM &arch-title;</entry>
158 <entry>s390x</entry>158 <entry>&architecture;</entry>
159 <entry>IPL from VM-reader and DASD</entry>159 <entry>IPL from VM-reader and DASD</entry>
160 <entry>generic</entry>160 <entry>generic</entry>
161</row>161</row>
162162
163<row> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->163<row> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
164 <entry>IBM z/Architecture</entry>164 <entry>IBM z/Architecture</entry>
165 <entry>s390x</entry>165 <entry>&architecture;</entry>
166 <entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>166 <entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>
167 <entry>zEC12 and newer machines</entry>167 <entry>zEC12 and newer machines</entry>
168</row>168</row>
@@ -395,6 +395,7 @@
395395
396&network-cards.xml;396&network-cards.xml;
397&accessibility-hardware.xml;397&accessibility-hardware.xml;
398&disk-storage.xml;
398&supported-peripherals.xml;399&supported-peripherals.xml;
399400
400 </sect1>401 </sect1>
401402
=== 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 @@
3838
39For more information on where to get CDs, see <xref linkend="official-cdrom" />.39For more information on where to get CDs, see <xref linkend="official-cdrom" />.
4040
41</para><para>41</para><para arch="not-s390">
4242
43Some installation methods require other images than CD images.43Some installation methods require other images than CD images.
44<phrase condition="unofficial-build">44<phrase condition="unofficial-build">
@@ -48,15 +48,24 @@
48<xref linkend="where-files" /> explains how to find images on &debian;48<xref linkend="where-files" /> explains how to find images on &debian;
49mirrors.49mirrors.
5050
51</para><para>51</para><para arch="s390">
5252
53The subsections below will give the details about which images you should53The installation on &architecture; requires at least an installer kernel and initrd file.
54This 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.
55
56</para><para>
57
58The easiest way is probably to download the (CDROM) image, because the files most people need are there on the image.
59
60</para><para>
61
62The subsections below will give the details about which image(s) you should
54get for each possible means of installation.63get for each possible means of installation.
5564
56</para>65</para>
5766
58 <sect2 id="howto-getting-images-cdrom">67 <sect2 id="howto-getting-images-cdrom">
59 <title>CDROM</title>68 <title>Booting from CDROM</title>
6069
61<para condition="not-ubuntu">70<para condition="not-ubuntu">
6271
@@ -70,7 +79,17 @@
7079
71</para><para>80</para><para>
7281
73Download the image for your architecture and burn it to a CD.82First of all download the image for your architecture and burn it to a CD/DVD.
83
84</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>.
85
86</para><para arch="s390">
87
88The installation from a USB drive on &architecture; is very similar (and not comparable to other architectures).
89In 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.
90
91</para><para>
92
74<phrase arch="any-x86">To boot the CD, you may need to change your BIOS93<phrase arch="any-x86">To boot the CD, you may need to change your BIOS
75configuration, as explained in <xref linkend="bios-setup" />.</phrase>94configuration, as explained in <xref linkend="bios-setup" />.</phrase>
76<phrase arch="powerpc">95<phrase arch="powerpc">
@@ -171,8 +190,8 @@
171190
172It's also possible to boot the &ubuntu; installer completely from the net. The191It's also possible to boot the &ubuntu; installer completely from the net. The
173various methods to netboot depend on your architecture and netboot setup.192various methods to netboot depend on your architecture and netboot setup.
174The files in <filename>netboot/</filename> can be used to netboot the &ubuntu;193<phrase arch="not-s390">The files in <filename>netboot/</filename> can be used to netboot the &ubuntu;
175installer.194installer.</phrase>
176195
177</para><para arch="x86">196</para><para arch="x86">
178197
@@ -184,12 +203,46 @@
184everything will just work.203everything will just work.
185For detailed instructions, see <xref linkend="install-tftp" />.204For detailed instructions, see <xref linkend="install-tftp" />.
186205
206</para><para arch="s390">
207
208Booting the installer from network is on the &architecture; platform quite flexible and convinient, hence the recommended way.
209But some initial steps are required.
210The CD/DVD image needs to be extracted and made available via FTP.
211It's crucial that the FTP server itself is reachable by the HMC, the SE and the LPAR or z/VM guest to be installed.
212A dedicated network is usually setup just for this purpose.
213Once 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>.
214Anonymous FTP is possible, too.
215
187</para>216</para>
188 </sect2>217 </sect2>
189218
190 <sect2 arch="linux-any" id="howto-getting-images-hard-disk" condition="not-ubuntu">219 <sect2 arch="linux-any" id="howto-getting-images-hard-disk"> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
191 <title>Booting from hard disk</title>220 <title>Booting from CMS disk (z/VM)</title>
192<para>221<para arch="s390">
222
223On z/VM the usual way to boot the installer is to use the (virtual) puncher.
224At least the files <filename>initrd.&debian-lc;</filename> and <filename>kernel.&debian-lc;</filename> are needed.
225These 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>.
226</para><para>
227It's recommended to download <filename>parmfile.&debian-lc;</filename> and <filename>&debian-lc;.exec</filename> as well, but using <command>ascii</command> mode.
228</para><para>
229Properly transfered to CMS, the installation files can be booted by just executing the <filename>&debian-lc;.exec</filename> REXX script.
230Alternatively you can also execute the steps from the script manually.
231 <informalexample role="example"><screen>
232/* REXX EXEC TO IPL Ubuntu for */
233/* z Systems FROM THE VM READER. */
234/* */
235'CP CLOSE RDR'
236'PURGE RDR ALL'
237'SPOOL PUNCH * RDR'
238'PUNCH KERNEL UBUNTU * (NOHEADER'
239'PUNCH PARMFILE UBUNTU * (NOHEADER'
240'PUNCH INITRD UBUNTU * (NOHEADER'
241'CHANGE RDR ALL KEEP NOHOLD'
242'CP IPL 000C CLEAR'
243</screen></informalexample>
244
245</para><para arch="not-s390" condition="not-ubuntu">
193246
194It's possible to boot the installer using no removable media, but just an247It's possible to boot the installer using no removable media, but just an
195existing hard disk, which can have a different OS on it. Download248existing hard disk, which can have a different OS on it. Download
@@ -229,7 +282,7 @@
229</para><para>282</para><para>
230283
231Now sit back while the installer detects some of your hardware, and284Now sit back while the installer detects some of your hardware, and
232loads the rest of itself from CD, floppy, USB, etc.285loads the rest of itself from CD, USB<phrase condition="bootable-usb">, floppy</phrase><phrase arch="s390">, network</phrase>, etc.
233286
234</para><para>287</para><para>
235288
@@ -246,11 +299,14 @@
246299
247</para><para>300</para><para>
248301
249Setting up your clock and time zone is followed by the creation of user accounts. By302Setting up your clock and time zone is followed by the creation of user accounts.
250default you are asked to provide a password for the <quote>root</quote>303
304By default you are asked to provide a password for the <quote>root</quote>
251(administrator) account and information necessary to create one regular user305(administrator) account and information necessary to create one regular user
252account. If you do not specify a password for the <quote>root</quote> user this306account. If you choose <quote>No</quote> on the
253account will be disabled but the <command>sudo</command> package will be installed307<guimenuitem>Allow login as root?</guimenuitem> question or if you
308do not specify a password for the <quote>root</quote> user this account
309will be disabled, but the <command>sudo</command> package will be installed
254later to enable administrative tasks to be carried out on the new system.310later to enable administrative tasks to be carried out on the new system.
255311
256</para><para>312</para><para>
@@ -273,9 +329,11 @@
273If you want to customize the partition layout, choose <guimenuitem>Manually329If you want to customize the partition layout, choose <guimenuitem>Manually
274edit partition table</guimenuitem> from the menu, and330edit partition table</guimenuitem> from the menu, and
275the next screen will show you your partition table, how the partitions will331the next screen will show you your partition table, how the partitions will
276be formatted, and where they will be mounted. Select a partition to modify or332be formatted, and where they will be mounted.
277delete it. Remember to assign at least one partition333Select a partition to modify or delete it.
278for swap space and to mount a partition on <filename>/</filename>.334Remember that since 18.04 a swap file is the default, rather than a swap partition.
335But you are still able to assign a partition for swap space.
336Remember to mount one partition on <filename>/</filename> (root).
279For more detailed information on how to use the partitioner, please refer337For more detailed information on how to use the partitioner, please refer
280to <xref linkend="di-partition" />; the appendix <xref338to <xref linkend="di-partition" />; the appendix <xref
281linkend="partitioning" /> has more general information about339linkend="partitioning" /> has more general information about
@@ -315,7 +373,7 @@
315</para><para>373</para><para>
316374
317The installer will now tell you that the first stage of installation has375The installer will now tell you that the first stage of installation has
318finished. Remove the CD and hit &enterkey; to reboot376finished. Remove the CD (if needed) and hit &enterkey; to reboot
319your machine. It should boot up into the newly installed system and377your machine. It should boot up into the newly installed system and
320allow you to log in. This is explained in <xref linkend="boot-new"/>.378allow you to log in. This is explained in <xref linkend="boot-new"/>.
321379
322380
=== 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 @@
8We will show how to set up the memory stick to use the first partition,8We will show how to set up the memory stick to use the first partition,
9instead of the entire device.9instead of the entire device.
1010
11</para><note><para>11</para>
12<note><para>
1213
13Since most USB sticks come pre-configured with a single FAT1614Since most USB sticks come pre-configured with a single FAT16
14partition, you probably won't have to repartition or reformat the15partition, you probably won't have to repartition or reformat the
@@ -36,7 +37,8 @@
36<command>mkdosfs</command> command is contained in the37<command>mkdosfs</command> command is contained in the
37<classname>dosfstools</classname> &debian; package.38<classname>dosfstools</classname> &debian; package.
3839
39</para></note><para>40</para></note>
41<para>
4042
41In order to start the kernel after booting from the USB stick, we will43In order to start the kernel after booting from the USB stick, we will
42put a boot loader on the stick. Although any boot loader44put a boot loader on the stick. Although any boot loader
4345
=== 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 @@
11and mount partitions. Here's the basic naming scheme:11and mount partitions. Here's the basic naming scheme:
1212
13</para>13</para>
14<itemizedlist arch="not-s390">14<itemizedlist>
15<listitem><para>15<listitem arch="not-s390"><para>
1616
17The first floppy drive is named <filename>/dev/fd0</filename>.17The first floppy drive is named <filename>/dev/fd0</filename>.
1818
19</para></listitem>19</para></listitem>
20<listitem><para>20<listitem arch="not-s390"><para>
2121
22The second floppy drive is named <filename>/dev/fd1</filename>.22The second floppy drive is named <filename>/dev/fd1</filename>.
2323
@@ -33,7 +33,7 @@
33and so on.33and so on.
3434
35</para></listitem>35</para></listitem>
36<listitem><para>36<listitem arch="not-s390"><para>
3737
38The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also38The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also
39known as <filename>/dev/sr0</filename>.39known as <filename>/dev/sr0</filename>.
@@ -41,7 +41,8 @@
41</para></listitem>41</para></listitem>
42</itemizedlist>42</itemizedlist>
4343
44<itemizedlist arch="s390">44<para arch="s390">
45<itemizedlist>
45<listitem><para>46<listitem><para>
4647
47The first DASD device is named48The first DASD device is named
@@ -56,14 +57,31 @@
56</para></listitem>57</para></listitem>
57</itemizedlist>58</itemizedlist>
5859
59<para arch="not-s390">60After dasdz, the naming starts over with dasdaa, dasdab, ... up to dasdzz.
61</para>
62
63<para arch="s390">
6064
61The partitions on each disk are represented by appending a decimal65The partitions on each disk are represented by appending a decimal
66number to the disk name: <filename>dasda1</filename> and
67<filename>dasda2</filename> represent the first and
68second partitions of the first DASD device in your system.
69
70</para>
71
72<para>
73
74<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.
75</phrase>
76
77The partitions on each SCSI disk are represented by appending a decimal
62number to the disk name: <filename>sda1</filename> and78number to the disk name: <filename>sda1</filename> and
63<filename>sda2</filename> represent the first and79<filename>sda2</filename> represent the first and
64second partitions of the first SCSI disk drive in your system.80second partitions of the first SCSI disk drive in your system.
6581
66</para><para arch="not-s390">82</para>
83
84<para arch="not-s390">
6785
68Here is a real-life example. Let's assume you have a system with 286Here is a real-life example. Let's assume you have a system with 2
69SCSI disks, one at SCSI address 2 and the other at SCSI address 4.87SCSI disks, one at SCSI address 2 and the other at SCSI address 4.
@@ -74,14 +92,18 @@
74<filename>sda3</filename>. The same applies to the92<filename>sda3</filename>. The same applies to the
75<filename>sdb</filename> disk and its partitions.93<filename>sdb</filename> disk and its partitions.
7694
77</para><para arch="not-s390">95</para>
96
97<para>
7898
79Note that if you have two SCSI host bus adapters (i.e., controllers),99Note that if you have two SCSI host bus adapters (i.e., controllers),
80the order of the drives can get confusing. The best solution in this100the order of the drives can get confusing. The best solution in this
81case is to watch the boot messages, assuming you know the drive models101case is to watch the boot messages, assuming you know the drive models
82and/or capacities.102and/or capacities.
83103
84</para><para arch="x86">104</para>
105
106<para arch="x86">
85107
86Linux represents the primary partitions as the drive name, plus the108Linux represents the primary partitions as the drive name, plus the
87numbers 1 through 4. For example, the first primary partition on the109numbers 1 through 4. For example, the first primary partition on the
@@ -91,19 +113,15 @@
91partition, that is, the primary partition holding the logical113partition, that is, the primary partition holding the logical
92partitions, is not usable by itself.114partitions, is not usable by itself.
93115
94</para><para arch="sparc">116</para>
117
118<para arch="sparc">
95119
96Sun disk partitions allow for 8 separate partitions (or slices). The120Sun disk partitions allow for 8 separate partitions (or slices). The
97third partition is usually (and is preferred to have) the <quote>Whole121third partition is usually (and is preferred to have) the <quote>Whole
98Disk</quote> partition. This partition references all of the sectors of the122Disk</quote> partition. This partition references all of the sectors of the
99disk, and is used by the boot loader (either SILO, or Sun's).123disk, and is used by the boot loader (either SILO, or Sun's).
100124
101</para><para arch="s390">
102
103The partitions on each disk are represented by appending a decimal
104number to the disk name: <filename>dasda1</filename> and
105<filename>dasda2</filename> represent the first and
106second partitions of the first DASD device in your system.
107
108</para>125</para>
126
109 </sect1>127 </sect1>
110128
=== 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 @@
99<listitem><para>99<listitem><para>
100100
101&arch-title; version of <command>fdisk</command>; Please read the101&arch-title; version of <command>fdisk</command>; Please read the
102fdasd manual page or chapter 13 in102IBM Linux on Z and LinuxONE s390-tools overview and find the fdasd section there
103<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/docu/l390dd08.pdf">103<ulink url="https://www.ibm.com/developerworks/linux/linux390/s390-tools-overview.html">
104Device Drivers and Installation Commands</ulink> for details.104s390-tools overview</ulink> for further details.
105105
106</para></listitem>106</para></listitem>
107</varlistentry>107</varlistentry>
@@ -111,7 +111,7 @@
111111
112One of these programs will be run by default when you select112One of these programs will be run by default when you select
113<guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible113<guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible
114to use a different partitioning tool from the command line on VT2, but this114to use a different partitioning tool<phrase arch="not-s390"> from the command line on VT2</phrase>, but this
115is not recommended.115is not recommended.
116116
117</para><para arch="any-x86">Remember to mark your boot partition as117</para><para arch="any-x86">Remember to mark your boot partition as
118118
=== 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 @@
7<para>7<para>
88
9For new users, personal &debian; boxes, home systems, and other9For new users, personal &debian; boxes, home systems, and other
10single-user setups, a single <filename>/</filename> partition (plus10single-user setups, a single <filename>/</filename> partition (possibly plus a separate
11swap) is probably the easiest, simplest way to go. However, if your11swap) is probably the easiest, simplest way to go. However, if your
12partition is larger than around 6GB, choose ext3 as your partition12partition is larger than around 6GB, choose ext3 as your partition
13type. Ext2 partitions need periodic file system integrity checking,13type. Ext2 partitions need periodic file system integrity checking,
1414
=== 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 @@
13strictly 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>13strictly 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>
14<quote>Swap</quote> is scratch space for an operating system,14<quote>Swap</quote> is scratch space for an operating system,
15which allows the system to use disk storage as <quote>virtual15which allows the system to use disk storage as <quote>virtual
16memory</quote>. By putting swap on a separate partition, &arch-kernel; can make much16memory</quote>.
17more efficient use of it. <!-- the following no longer applies to Ubuntu 18.04 - see above --> <!-->It is possible to force &arch-kernel; to use a17&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.
18regular file as swap, but it is not recommended.</-->18<!-- 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.</-->
1919
20</para><para>20</para><para>
2121
2222
=== 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 @@
13have a system to work from while you fix it, and rescue mode can be useful13have a system to work from while you fix it, and rescue mode can be useful
14for this.14for this.
1515
16</para><para arch="not-s390">16</para><para>
1717
18<!-- TODO: describe what to do on arches where this isn't set up in the18There are several options to rescue a broken &debian; system on &architecture;:
19 bootloader -->19
20</para>
21<itemizedlist>
22<listitem arch="not-s390"><para>
23<!-- TODO: describe what to do on arches where this isn't set up in the bootloader -->
2024
21To access rescue mode, select <userinput>rescue</userinput> from the25To access rescue mode, select <userinput>rescue</userinput> from the
22boot menu, type <userinput>rescue</userinput> at the26boot menu (if available) or append the boot parameter <userinput>rescue</userinput>
23<prompt>boot:</prompt> prompt, or boot with the27or <userinput>systemd.unit=emergency.target</userinput>
24<userinput>rescue/enable=true</userinput> boot parameter. You'll be28to the <guimenuitem>linux</guimenuitem> kernel boot entry of the boot loader.
25shown the first few screens of the installer, with a note in the29
30</para><para>
31
32While booting the system enter the boot loader menu:
33
34<informalexample role="example"><screen>
35 GNU GRUB version 2.02
36
37 ┌────────────────────────────────────────────────────────────────────────────┐
38 │*Ubuntu │
39 │ Advanced options for Ubuntu │
40 │ │
41 │ │
42 │ │
43 │ │
44 │ │
45 │ │
46 │ │
47 │ │
48 │ │
49 │ │
50 │ │
51 └────────────────────────────────────────────────────────────────────────────┘
52
53 Use the ↑ and ↓ keys to select which entry is highlighted.
54 Press enter to boot the selected OS, 'e' to edit the commands
55 before booting or 'c' for a command-line.
56</screen></informalexample>
57
58Then type <command>e</command> to edit the boot loader configuration and entries,
59navigate to your prefered Linux kernel line and append either
60<userinput>rescue</userinput> or <userinput>systemd.unit=emergency.target</userinput>.
61
62<informalexample role="example"><screen>
63 GNU GRUB version 2.02
64
65 ┌────────────────────────────────────────────────────────────────────────────┐
66 │ insmod ext2 │
67 │ set root='hd0,gpt2'or Ubuntu │
68 │ if [ x$feature_platform_search_hint = xy ]; then │
69 │ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,g\│
70 │pt2 --hint-efi=hd0,gpt2 --hint-baremetal=ahci0,gpt2 ea967ae0-7519-11eB-85b\│
71 │d-5254008bdef4 │
72 │ else │
73 │ search --no-floppy --fs-uuid --set=root ea967ae0-7519-11e\│
74 │8-85bd-5254008bdef4 │
75 │ fi │
76 │ echo 'Loading Linux 4.15.0-23-generic ...' │
77 │ linux /boot/vmlinuz-4.15.0-23-generic root=UUID=ea96\│
78 │7ae0-7519-11eB-85bd-5254008bdef4 ro maybe-ubiquity rescue │
79 └────────────────────────────────────────────────────────────────────────────┘
80
81 Minimum Emacs-like screen editing is supported. TAB lists
82 completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for
83 a command-line or ESC to discard edits and return to the GRUB menu.
84</screen></informalexample>
85
86Then press either Ctrl-x or F10 to boot with the modified entry
87and the system will enter the rescue mode.
88
89<informalexample role="example"><screen>
90...
91[ OK ] Started Update UTMP about System Runlevel Changes.
92You are in rescue mode. After logging in, type "journalctl -xb" to view
93system logs, "systemctl reboot" to reboot, "systemctl default" or "exit"
94to boot into default mode.
95Press Enter for maintenance
96(or press Control-D to continue):
97root@ubuntu:~#
98</screen></informalexample>
99
100</para></listitem>
101
102<listitem arch="not-s390"><para>
103<!-- TODO: describe what to do on arches where this isn't set up in the bootloader -->
104
105Alternatively 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? -->
106You'll be shown the first few screens of the installer, with a note in the
26corner of the display to indicate that this is rescue mode, not a full107corner of the display to indicate that this is rescue mode, not a full
27installation. Don't worry, your system is not about to be overwritten!108installation. Don't worry, your system is not about to be overwritten!
28Rescue mode simply takes advantage of the hardware detection109Rescue mode simply takes advantage of the hardware detection
29facilities available in the installer to ensure that your disks,110facilities available in the installer to ensure that your disks,
30network devices, and so on are available to you while repairing your111network devices, and so on are available to you while repairing your system.
31system.112
32113</para><para>
33</para><para arch="s390">114
34115</para></listitem>
35There are two options to rescue a broken &debian; on &architecture; system:116
36117<listitem arch="s390"><para> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
37</para><para arch="s390">118
38119The zipl boot menu offers by default an option to boot an <guimenuitem>old</guimenuitem> kernel via the boot option number <guimenuitem>2</guimenuitem>.
39First 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>.
40<informalexample role="example"><screen>120<informalexample role="example"><screen>
41zIPL v2.3.0-build-20180425 interactive boot menu121zIPL v2.3.0-build-20180425 interactive boot menu
42 122
@@ -46,43 +126,213 @@
46 2. old 126 2. old
47Please choose (default will boot in 10 seconds):127Please choose (default will boot in 10 seconds):
48</screen></informalexample>128</screen></informalexample>
49Boot problems are often introduced by a kernel change.129Boot problems are often introduced with a kernel change.
50So there is a good chance that the prior / old kernel will still work.130So there is a good chance that the prior / old kernel will still work.
51131
52</para><para arch="s390">132</para></listitem>
53133<listitem arch="s390"><para> <!-- FIXME: nothing like condition="not-debian" or condition="ubuntu-only" supported, yet -->
54The second option is to boot an installation kernel and select from the inital screen the <guimenuitem>Start shell</guimenuitem> entry.134
55<informalexample role="example"><screen>135Another option is to use the installation kernel and initrd in it's rescue mode (sometimes also known as recovery mode).
56 ┌────────────────────────┤ [!!] Configuring d-i ├─────────────────────────┐ 136To activate the rescue mode, one needs to boot with the <quote>rescue/enable=true</quote> boot parameter,
57 │ │ 137and this parameter needs to be added to the <filename>parmfile.&debian-lc;</filename> file.
58 │ This is the network console for the Debian installer. From here, you │ 138This is slightly different for an LPAR compared to a z/VM guest.
59 │ may start the Debian installer, or execute an interactive shell. │ 139
60 │ │ 140</para><para>
61 │ To return to this menu, you will need to log in again. │ 141For an LPAR change to the network install server, where the image got extracted and enter the image's ./boot folder.
62 │ │ 142You can now just open the <filename>parmfile.&debian-lc;</filename>, add the <quote>rescue/enable=true</quote> boot parameter
63 │ Network console option: │ 143and proceed like you would usually do for an LPAR installation, means with the HMC task
64 │ │ 144<guimenuitem>Load from Removable Media or Server</guimenuitem>.
65 │ Start installer │ 145</para><para>
66 │ Start installer (expert mode) │ 146But at this point it's better to add a dedicated boot entry for the rescue mode.
67 │ Start shell │ 147Therefore you need to copy the <filename>parmfile.&debian-lc;</filename> and the <filename>&debian-lc;.ins</filename>
68 │ │ 148to 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:
69 └─────────────────────────────────────────────────────────────────────────┘149
70</screen></informalexample>150<informalexample role="example"><screen>
71The functionality in the &d-i; shell is limited, however, it can still act as a rescue system to fix a broken installation.151Login to your network boot (FTP) server.
72152
73</para><para arch="not-s390">153$ cd &lt;path to the extracted &debian-lc; server image&gt;/&debian-lc;-server-&release;/boot
74154$ cp &debian-lc;.ins rescue.ins
155$ cp parmfile.&debian-lc; parmfile.rescue
156
157Change rescue.ins from it's default:
158$ cat rescue.ins
159* &debian; for z Series (default kernel)
160kernel.&debian-lc; 0x00000000
161initrd.off 0x0001040c
162initrd.siz 0x00010414
163parmfile.&debian-lc; 0x00010480
164initrd.&debian-lc; 0x01000000
165
166To the following:
167$ cat rescue.ins
168* &debian; for z Series (default kernel)
169kernel.&debian-lc; 0x00000000
170initrd.off 0x0001040c
171initrd.siz 0x00010414
172parmfile.rescue 0x00010480
173initrd.&debian-lc; 0x01000000
174
175And open parmfile.rescue and add <quote>rescue/enable=true</quote> (the parmfile is empty by default):
176$ cat parmfile.rescue
177rescue/enable=true
178</screen></informalexample>
179
180Now start the <guimenuitem>Load from Removable Media or Server</guimenuitem> task, select <guimenuitem>FTP source</guimenuitem>,
181enter the data of your network boot (FTP) server, and the step <guimenuitem>Select the software to install</guimenuitem>
182you will find in addition to the default entry another entry for the rescue mode:
183
184<informalexample role="example"><screen>
185Load from Removable Media or Server - Select Software to Install - P00ABCDE:LINLPAR
186Select the software to install.
187Select | Name | Description
188 * | &debian-lc;-server-&release;/boot/rescue.ins | &debian; for z Series (default kernel)
189 o | &debian-lc;-server-&release;/boot/&debian-lc;.ins | &debian; for z Series (default kernel)
190</screen></informalexample>
191
192Make sure <guimenuitem>&debian-lc;-server-&release;/boot/rescue.ins</guimenuitem> is selected and proceed with <guimenuitem>OK</guimenuitem>.
193</para><para>
194For a z/VM guest you need to access the Minidisk where the installer files,
195including the <filename>parmfile.&debian-lc;</filename> is located, add the <quote>rescue/enable=true</quote> boot parameter
196and proceed like you would usually do for a z/VM installation, means by executing the <guimenuitem>&debian-lc; exec</guimenuitem> REXX script.
197
198But here it's again better to add a dedicated boot script for the rescue mode.
199Therefore you need to copy the <filename>parmfile &debian-lc;</filename> and the <filename>&debian-lc; exec</filename>
200to create seperate versions for the rescue mode:
201
202<informalexample role="example"><screen>
203Logon to your z/VM system, have CMS active (ipl-ed)
204and make sure you have r/w acces to the Minidisk where the installations files are located.
205In this example <quote>File Mode</quote> (Fm) <quote>A</quote> is used, that might be different on your system.
206Copy the following files:
207
208copyfiles &debian-lc; exec a rescue exec a
209copyfiles parmfile &debian-lc; a parmfile rescue a
210
211listfiles rescue * a
212RESCUE EXEC A1
213listfiles * rescue a
214PARMFILE RESCUE A1
215
216Change PARMFILE RESCUE (by default it's empty):
217
218x PARMFILE RESCUE A
219* * * Top of File * * *
220
221* * * End of File * * *
222
223To the following:
224
225x PARMFILE RESCUE A
226* * * Top of File * * *
227rescue/enable=true
228* * * End of File * * *
229
230Now modify the RESCUE EXEC file as well so that it point to the new <filename>parmfile rescue</filename> file:
231x RESCUE EXEC A
232* * * Top of File * * *
233/* REXX EXEC TO IPL &debian;'s Rescue Mode */
234/* z Systems FROM THE VM READER. */
235/* */
236'CP CLOSE RDR'
237'PURGE RDR ALL'
238'SPOOL PUNCH * RDR'
239'PUNCH KERNEL UBUNTU * (NOHEADER'
240'PUNCH PARMFILE RESCUE * (NOHEADER'
241'PUNCH INITRD UBUNTU * (NOHEADER'
242'CHANGE RDR ALL KEEP NOHOLD'
243'CP IPL 000C CLEAR'
244* * * End of File * * *
245</screen></informalexample>
246</para>
247
248<para>Now start the z/VM guest installation as usual, but using the newly created REXX script for the rescue mode, hence just type:
249<command>rescue &lt;Enter&gt;</command>
250</para><para>
251Don'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.
252</para>
253
254<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:
255
256<informalexample role="example"><screen>
257Rescue mode
258 ┌─────────┤ [?] Ubuntu installer main menu ├─────────┐
259 │ │
260 │ Choose the next step in the install process: │
261 │ │
262 │ Configure the network device │
263 │ Configure the network │
264 │ Choose language │
265 │ Choose a mirror of the Ubuntu archive │
266 │ Download installer components │
267 │ Change debconf priority │
268 │ Save debug logs │
269 │ Execute a shell │
270 │ Abort the installation │
271 │ │
272 └────────────────────────────────────────────────────┘
273</screen></informalexample>
274
275Don'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>
276
277<para>
75Instead of the partitioning tool, you should now be presented with a list of278Instead of the partitioning tool, you should now be presented with a list of
76the partitions on your system, and asked to select one of them. Normally,279the partitions on your system, and asked to select one of them. Normally,
77you should select the partition containing the root file system that you280you should select the partition containing the root file system that you
78need to repair. You may select partitions on RAID and LVM devices as well as281need to repair. You may select partitions on RAID and LVM devices as well as
79those created directly on disks.282those created directly on disks:
80283
81</para><para arch="not-s390">284<informalexample role="example"><screen>
285Rescue mode
286 ┌───────────────────────┤ [!!] Enter rescue mode ├────────────────────────┐
287 │ │
288 │ Enter a device you wish to use as your root file system. You will be │
289 │ able to choose among various rescue operations to perform on this │
290 │ file system. │
291 │ │
292 │ If you choose not to use a root file system, you will be given a │
293 │ reduced choice of operations that can be performed without one. This │
294 │ may be useful if you need to correct a partitioning problem. │
295 │ │
296 │ Device to use as root file system: │
297 │ │
298 │ /dev/sda1 │
299 │ /dev/sdb1 │
300 │ Assemble RAID array │
301 │ │
302 │ &lt;Go Back&gt; │
303 │ │
304 └─────────────────────────────────────────────────────────────────────────┘
305</screen></informalexample>
306
307<!---
308The <guimenuitem>Ubuntu installer main menu</guimenuitem> provides the menu item <guimenuitem>Enter rescue mode</guimenuitem>.
309
310<informalexample role="example"><screen>
311Rescue mode
312 ┌──────────────┤ [?] Ubuntu installer main menu ├──────────────┐
313 │ │
314 │ Choose the next step in the install process: │
315 │ │
316 │ Detect virtual driver disks from hardware manufacturer │
317 │ Configure the network device │
318 │ Configure the network │
319 │ Choose language │
320 │ Choose a mirror of the Ubuntu archive │
321 │ Download installer components │
322 │ Configure the clock │
323 │ Configure direct access storage devices (DASD) │
324 │ Activate FCP devices for installation │
325 │ Detect disks │
326 │ Enter rescue mode * │
327 │ │
328 └──────────────────────────────────────────────────────────────┘
329</screen></informalexample>
330-->
331
332</para><para> <!-- removed: arch="not-s390" -->
82333
83If possible, the installer will now present you with a shell prompt in the334If possible, the installer will now present you with a shell prompt in the
84file system you selected, which you can use to perform any necessary335file system you selected, which you can use to perform any necessary repairs.
85repairs.
86336
87<phrase arch="any-x86">337<phrase arch="any-x86">
88For example, if you need to reinstall the GRUB boot loader into the master338For example, if you need to reinstall the GRUB boot loader into the master
@@ -90,16 +340,45 @@
90<userinput>grub-install '(hd0)'</userinput> to do so.340<userinput>grub-install '(hd0)'</userinput> to do so.
91</phrase>341</phrase>
92342
93</para><para arch="not-s390">343</para><para> <!-- removed: arch="not-s390" -->
94344
95If the installer cannot run a usable shell in the root file system you345If the installer cannot run a usable shell in the root file system you
96selected, perhaps because the file system is corrupt, then it will issue a346selected, perhaps because the file system is corrupt, then it will issue a
97warning and offer to give you a shell in the installer environment instead.347warning and offer to give you a shell in the installer environment instead.
348
98You may not have as many tools available in this environment, but they will349You may not have as many tools available in this environment, but they will
99often be enough to repair your system anyway. The root file system you350often be enough to repair your system anyway.
351The root file system you
100selected will be mounted on the <filename>/target</filename> directory.352selected will be mounted on the <filename>/target</filename> directory.
101353
102</para><para arch="not-s390">354</para></listitem>
355<listitem><para> <!-- FIXME: Does this still apply for amd64, since there is subuquity on amd64? -->
356
357A 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.
358
359<informalexample role="example"><screen>
360 ┌────────────────────────┤ [!!] Configuring d-i ├─────────────────────────┐
361 │ │
362 │ This is the network console for the Debian installer. From here, you │
363 │ may start the Debian installer, or execute an interactive shell. │
364 │ │
365 │ To return to this menu, you will need to log in again. │
366 │ │
367 │ Network console option: │
368 │ │
369 │ Start installer │
370 │ Start installer (expert mode) │
371 │ Start shell │
372 │ │
373 └─────────────────────────────────────────────────────────────────────────┘
374</screen></informalexample>
375
376The functionality in the &d-i; shell is limited, however, it can still act as a rescue system to fix a broken installation.
377While not using the rescue mode, be careful to not accidentially repartition or format any disk which may cause data loss.
378
379</para>
380</listitem>
381</itemizedlist><para>
103382
104In either case, after you exit the shell, the system will reboot.383In either case, after you exit the shell, the system will reboot.
105384
106385
=== 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 @@
21If you already have an operating system on your system21If you already have an operating system on your system
2222
23<phrase arch="any-x86">23<phrase arch="any-x86">
24(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;)24(Windows 9x, Windows NT/2000/XP/2003/Vista/7/8/10, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
25</phrase>25</phrase>
2626
27<phrase arch="s390">27<phrase arch="s390">
@@ -34,12 +34,13 @@
34partitions with other Unix systems, but that's not covered here.34partitions with other Unix systems, but that's not covered here.
35At the very least you will need a dedicated partition for the &debian;35At the very least you will need a dedicated partition for the &debian;
36root filesystem.36root filesystem.
37<note><para arch="s390">37
38<note arch="s390"><para>
38Please 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.39Please 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.
39</para></note>40</para></note>
4041</para>
41</para><para>42
4243<para>
43You can find information about your current partition setup by using44You can find information about your current partition setup by using
44a partitioning tool for your current operating system<phrase45a partitioning tool for your current operating system<phrase
45arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in46arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in
4647
=== 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 @@
63that country selected as the default. Use the <guibutton>Go Back</guibutton>63that country selected as the default. Use the <guibutton>Go Back</guibutton>
64option to select countries on a different continent.64option to select countries on a different continent.
6565
66</para><note><para>66</para>
67<note><para>
6768
68It is important to select the country where you live or where you are69It is important to select the country where you live or where you are
69located as it determines the time zone that will be configured for the70located as it determines the time zone that will be configured for the
70installed system.71installed system.
7172
72</para></note><para>73</para></note>
74<para>
7375
74If you selected a combination of language and country for which no locale is76If you selected a combination of language and country for which no locale is
75defined and there exist multiple locales for the language, then the installer77defined and there exist multiple locales for the language, then the installer
7678
=== 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 @@
211<guimenu>Use as:</guimenu> <guimenuitem>physical volume for211<guimenu>Use as:</guimenu> <guimenuitem>physical volume for
212RAID</guimenuitem> </menuchoice>.)212RAID</guimenuitem> </menuchoice>.)
213213
214</para><note><para>214</para>
215<note><para>
215216
216Make sure that the system can be booted with the partitioning scheme217Make sure that the system can be booted with the partitioning scheme
217you are planning. In general it will be necessary to create a separate218you are planning. In general it will be necessary to create a separate
@@ -222,7 +223,8 @@
222<filename>/</filename> and RAID1 for <filename>/boot</filename> can be223<filename>/</filename> and RAID1 for <filename>/boot</filename> can be
223an option.224an option.
224225
225</para></note><para>226</para></note>
227<para>
226228
227Next, you should choose <guimenuitem>Configure software229Next, you should choose <guimenuitem>Configure software
228RAID</guimenuitem> from the main <command>partman</command> menu.230RAID</guimenuitem> from the main <command>partman</command> menu.
229231
=== 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 @@
56Fill in the answers from56Fill in the answers from
57<xref linkend="needed-info"/>.57<xref linkend="needed-info"/>.
5858
59</para><note><para>59</para>
60<note><para>
6061
61Some technical details you might, or might not, find handy: the program62Some technical details you might, or might not, find handy: the program
62assumes the network IP address is the bitwise-AND of your system's IP63assumes the network IP address is the bitwise-AND of your system's IP
@@ -64,7 +65,9 @@
64the bitwise OR of your system's IP address with the bitwise negation of65the bitwise OR of your system's IP address with the bitwise negation of
65the netmask. It will also guess your gateway. If you can't find any of66the netmask. It will also guess your gateway. If you can't find any of
66these answers, use the offered defaults &mdash; if necessary, you can67these answers, use the offered defaults &mdash; if necessary, you can
67change 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.68change them by editing <filename>/etc/netplan/01-netcfg.yaml</filename>
69(or <filename>/etc/network/interfaces</filename> - in case you switched from netplan to ifupdown)
70once the system has been installed.
6871
69</para></note>72</para></note>
70</sect4>73</sect4>
7174
=== 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 @@
69login the fingerprint of the remote system will be displayed and69login the fingerprint of the remote system will be displayed and
70you will have to confirm that it is correct.70you will have to confirm that it is correct.
7171
72</para><note><para>72</para>
73<note><para>
7374
74The <command>ssh</command> server in the installer uses a default75The <command>ssh</command> server in the installer uses a default
75configuration that does not send keep-alive packets. In principle,76configuration that does not send keep-alive packets. In principle,
@@ -108,7 +109,8 @@
108<command>ssh-keygen -R &lt;<replaceable>hostname</replaceable>|<replaceable>IP&nbsp;address</replaceable>&gt;</command>.109<command>ssh-keygen -R &lt;<replaceable>hostname</replaceable>|<replaceable>IP&nbsp;address</replaceable>&gt;</command>.
109</para></footnote> and try again.110</para></footnote> and try again.
110111
111</para></note><para>112</para></note>
113<para>
112114
113After the login you will be presented with an initial screen where you115After the login you will be presented with an initial screen where you
114have two possibilities called <guimenuitem>Start menu</guimenuitem> and116have two possibilities called <guimenuitem>Start menu</guimenuitem> and
115117
=== 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 @@
30unencrypted, because currently there is no way to load the kernel from30unencrypted, because currently there is no way to load the kernel from
31an encrypted partition.31an encrypted partition.
3232
33</para><note><para>33</para>
34<note><para>
3435
35Please note that the performance of encrypted partitions will be36Please note that the performance of encrypted partitions will be
36less than that of unencrypted ones because the data needs to be37less than that of unencrypted ones because the data needs to be
37decrypted or encrypted for every read or write. The performance impact38decrypted or encrypted for every read or write. The performance impact
38depends 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>.39depends on your CPU speed, chosen cipher, the key length and whether
40you use hardware assisted cryptography operations or not<phrase arch="s390">
41(like supported by CPACF,
42the Central Processor Assist for Cryptographic Function feature,
43or the CryptoExpress adapter cards)</phrase>.
3944
40</para></note><para>45</para></note>
46<para>
4147
42To use encryption, you have to create a new partition by selecting48To use encryption, you have to create a new partition by selecting
43some free space in the main partitioning menu. Another option is to49some free space in the main partitioning menu. Another option is to
4450
=== 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 @@
332This example shows two hard drives divided into several partitions;332This example shows two hard drives divided into several partitions;
333the first disk has some free space. Each partition line consists of333the first disk has some free space. Each partition line consists of
334the partition number, its type, size, optional flags, file system, and334the partition number, its type, size, optional flags, file system, and
335mountpoint (if any).<note>This particular setup cannot be created335mountpoint (if any).</para>
336<note><para>
337This particular setup cannot be created
336using guided partitioning but it does show possible variation that can338using guided partitioning but it does show possible variation that can
337be achieved using manual partitioning.</note>339be achieved using manual partitioning.
338340</para></note>
339</para><para>341
340342<para>
341This concludes the guided partitioning. If you are satisfied with the343This concludes the guided partitioning. If you are satisfied with the
342generated partition table, you can choose <guimenuitem>Finish344generated partition table, you can choose <guimenuitem>Finish
343partitioning and write changes to disk</guimenuitem> from the menu to345partitioning and write changes to disk</guimenuitem> from the menu to
344346
=== 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 @@
46computer you are installing. If you disagree with these selections you can46computer you are installing. If you disagree with these selections you can
47deselect them. You can even opt to install no tasks at all at this point.47deselect them. You can even opt to install no tasks at all at this point.
4848
49</para><para arch="s390">49</para>
50
51<para arch="s390">
5052
51In case the installer has a hard requirements on certain packages, like on53In case the installer has a hard requirements on certain packages, like on
52&architecture; where openssh is needed for the second installation stage,54&architecture; where openssh is needed for the second installation stage,
@@ -54,6 +56,7 @@
54<guimenuitem>OpenSSH server</guimenuitem> task is selected to not.56<guimenuitem>OpenSSH server</guimenuitem> task is selected to not.
5557
56</para>58</para>
59
57<tip><para>60<tip><para>
5861
59In the standard user interface of the installer, you can use the space bar62In the standard user interface of the installer, you can use the space bar
@@ -76,7 +79,7 @@
76</para><para>79</para><para>
7780
78Note that this will only work if the packages needed for the desired desktop81Note that this will only work if the packages needed for the desired desktop
79environment are actually available. If you are installing using a single82environment are actually available. If you are installing using a single
80full CD image, they will possibly need to be downloaded from a network mirror as83full CD image, they will possibly need to be downloaded from a network mirror as
81some of the needed packages for your choice might only be included on later84some of the needed packages for your choice might only be included on later
82CDs. Installing any of the available desktop environments this way should85CDs. Installing any of the available desktop environments this way should
8386
=== 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 @@
1<!-- retain these comments for translator revision tracking -->1<!-- retain these comments for translator revision tracking -->
2<!-- $Id: dasd.xml 11648 2004-03-22 00:37:46Z joeyh $ -->2<!-- $Id: dasd.xml 11648 2004-03-22 00:37:46Z joeyh $ -->
3
4<para>
5
6DASDs (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.
7The DASD block size is 4096 bytes (4KB) and they support up to 3 partitions per volume.
8
9</para>
310
=== 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 @@
1
2<para>
3
4FCP (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.
5
6<note><para>
7
8z/VM supports FCP devices as <quote>emulated devices</quote>, or in short <quote>EDEV</quote>.
9In this case SCSI disks are configured as disk units of type DASD 9336 FBA.
10For more details see the IBM z/VM documentation.
11</para></note>
12
13</para>

Subscribers

People subscribed via source and target branches

to all changes: