67 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			67 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From c8e615cf130743ee95a61d7e21bb4b753eb082fb Mon Sep 17 00:00:00 2001
 | |
| From: Jared Rossi <jrossi@linux.ibm.com>
 | |
| Date: Sat, 19 Oct 2024 21:29:40 -0400
 | |
| Subject: [PATCH 08/38] docs/system/s390x/bootdevices: Update the documentation
 | |
|  about network booting
 | |
| MIME-Version: 1.0
 | |
| Content-Type: text/plain; charset=UTF-8
 | |
| Content-Transfer-Encoding: 8bit
 | |
| 
 | |
| RH-Author: Thomas Huth <thuth@redhat.com>
 | |
| RH-MergeRequest: 278: Full boot order support for s390x [Centos 10]
 | |
| RH-Jira: RHEL-58153
 | |
| RH-Acked-by: Cédric Le Goater <clg@redhat.com>
 | |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
 | |
| RH-Commit: [7/23] 52d357df45400b983e17cc6b1eeac691131bf5e5 (thuth/qemu-kvm-cs9)
 | |
| 
 | |
| Remove the information about the separate s390-netboot.img from
 | |
| the documentation.
 | |
| 
 | |
| Co-authored by: Thomas Huth <thuth@redhat.com>
 | |
| Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
 | |
| Message-ID: <20241020012953.1380075-7-jrossi@linux.ibm.com>
 | |
| Signed-off-by: Thomas Huth <thuth@redhat.com>
 | |
| (cherry picked from commit ab2691b6c7ff360875e0af86ff463278f17786f5)
 | |
| ---
 | |
|  docs/system/s390x/bootdevices.rst | 20 +++++++-------------
 | |
|  1 file changed, 7 insertions(+), 13 deletions(-)
 | |
| 
 | |
| diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevices.rst
 | |
| index 1a7a18b43b..c97efb8fc0 100644
 | |
| --- a/docs/system/s390x/bootdevices.rst
 | |
| +++ b/docs/system/s390x/bootdevices.rst
 | |
| @@ -82,23 +82,17 @@ Note that ``0`` can be used to boot the default entry.
 | |
|  Booting from a network device
 | |
|  -----------------------------
 | |
|  
 | |
| -Beside the normal guest firmware (which is loaded from the file ``s390-ccw.img``
 | |
| -in the data directory of QEMU, or via the ``-bios`` option), QEMU ships with
 | |
| -a small TFTP network bootloader firmware for virtio-net-ccw devices, too. This
 | |
| -firmware is loaded from a file called ``s390-netboot.img`` in the QEMU data
 | |
| -directory. In case you want to load it from a different filename instead,
 | |
| -you can specify it via the ``-global s390-ipl.netboot_fw=filename``
 | |
| -command line option.
 | |
| -
 | |
| -The ``bootindex`` property is especially important for booting via the network.
 | |
| -If you don't specify the ``bootindex`` property here, the network bootloader
 | |
| -firmware code won't get loaded into the guest memory so that the network boot
 | |
| -will fail. For a successful network boot, try something like this::
 | |
| +The firmware that ships with QEMU includes a small TFTP network bootloader
 | |
| +for virtio-net-ccw devices.  The ``bootindex`` property is especially
 | |
| +important for booting via the network. If you don't specify the ``bootindex``
 | |
| +property here, the network bootloader won't be taken into consideration and
 | |
| +the network boot will fail. For a successful network boot, try something
 | |
| +like this::
 | |
|  
 | |
|   qemu-system-s390x -netdev user,id=n1,tftp=...,bootfile=... \
 | |
|                     -device virtio-net-ccw,netdev=n1,bootindex=1
 | |
|  
 | |
| -The network bootloader firmware also has basic support for pxelinux.cfg-style
 | |
| +The network bootloader also has basic support for pxelinux.cfg-style
 | |
|  configuration files. See the `PXELINUX Configuration page
 | |
|  <https://wiki.syslinux.org/wiki/index.php?title=PXELINUX#Configuration>`__
 | |
|  for details how to set up the configuration file on your TFTP server.
 | |
| -- 
 | |
| 2.39.3
 | |
| 
 |