From a6eec40cdbec0a2cb46707dfd62b255e9a7ba8df Mon Sep 17 00:00:00 2001
From: Cody Hoag <choag@redhat.com>
Date: Tue, 15 Sep 2020 13:46:05 -0400
Subject: [PATCH] bare metal now using live kernel

---
 .../installation-user-infra-machines-pxe.adoc | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/modules/installation-user-infra-machines-pxe.adoc b/modules/installation-user-infra-machines-pxe.adoc
index 73e245c3a5..542872c7c0 100644
--- a/modules/installation-user-infra-machines-pxe.adoc
+++ b/modules/installation-user-infra-machines-pxe.adoc
@@ -50,7 +50,7 @@ They resemble the following examples:
 
 ** ISO: `rhcos-<version>-installer.<architecture>.iso`
 ** Compressed metal RAW image: `rhcos-<version>metal.<architecture>.raw.gz`
-** `kernel`: `rhcos-<version>-installer-kernel-<architecture>`
+** `kernel`: `rhcos-<version>-installer-live-kernel-<architecture>`
 ** `initramfs`: `rhcos-<version>-installer-initramfs.<architecture>.img`
 endif::openshift-origin[]
 ifdef::openshift-origin[]
@@ -82,35 +82,29 @@ DEFAULT pxeboot
 TIMEOUT 20
 PROMPT 0
 LABEL pxeboot
-    KERNEL http://<HTTP_server>/rhcos-<version>-installer-kernel-<architecture> <1>
-    APPEND ip=dhcp rd.neednet=1 initrd=http://<HTTP_server>/rhcos-<version>-installer-initramfs.<architecture>.img console=tty0 console=ttyS0 coreos.inst=yes coreos.inst.install_dev=sda coreos.inst.image_url=http://<HTTP_server>/rhcos-<version>-metal.<architecture>.raw.gz coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign <2> <3>
+    KERNEL http://<HTTP_server>/rhcos-<version>-installer-live-kernel-<architecture> <1>
+    APPEND initrd=http://<HTTP_server>/rhcos-<version>-installer-live-initramfs.<architecture>.img console=ttyS0 console=tty0 coreos.inst.install_dev=/dev/sda coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign coreos.live.rootfs_url=http://<HTTP_server>/rhcos-<version>-installer-live-rootfs.<architecture>.img <2>
 ----
-<1> Specify the location of the `kernel` file that you uploaded to your HTTP
+<1> Specify the location of the live `kernel` file that you uploaded to your HTTP
 server.
-<2> If you use multiple NICs, specify a single interface in the `ip` option.
-For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
-<3> Specify locations of the {op-system} files that you uploaded to your
-HTTP server. The `initrd` parameter value is the location of the `initramfs` file,
-the `coreos.inst.image_url` parameter value is the location of the compressed
-metal RAW image, and the `coreos.inst.ignition_url` parameter value is the
-location of the bootstrap Ignition config file.
+<2> Specify locations of the {op-system} files that you uploaded to your HTTP
+server. The `initrd` parameter value is the location of the live `initramfs`
+file, the `coreos.inst.ignition_url` parameter value is the location of the
+bootstrap Ignition config file, and the `coreos.live.rootfs_url` parameter value is
+the location of the live `rootfs` file.
 
 ** For iPXE:
 +
 ----
-kernel  http://<HTTP_server>/rhcos-<version>-installer-kernel-<architecture> ip=dhcp rd.neednet=1 initrd=http://<HTTP_server>/rhcos-<version>-installer-initramfs.<architecture>.img console=tty0 console=ttyS0 coreos.inst=yes coreos.inst.install_dev=sda coreos.inst.image_url=http://<HTTP_server>/rhcos-<version>-metal.<arhcitectutre>.raw.gz coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign <1> <2>
-initrd http://<HTTP_server>/rhcos-<version>-installer-initramfs.<architecture>.img <3>
-boot
+kernel http://<HTTP_server>/rhcos-<version>-installer-kernel-<architecture> console=ttyS0 console=tty0 coreos.inst.install_dev=/dev/sda coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign coreos.live.rootfs_url=http://<HTTP_server>/rhcos-<version>-installer-live-rootfs.<architecture>.img <1>
+initrd=http://<HTTP_server>/rhcos-<version>-installer-live-initramfs.<architecture>.img <2>
 ----
 <1> Specify locations of the {op-system} files that you uploaded to your
 HTTP server. The `kernel` parameter value is the location of the `kernel` file,
-the `initrd` parameter value is the location of the `initramfs` file,
-the `coreos.inst.image_url` parameter value is the location of the compressed
-metal RAW image, and the `coreos.inst.ignition_url` parameter value is the
-location of the bootstrap Ignition config file.
-<2> If you use multiple NICs, specify a single interface in the `ip` option.
-For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
-<3> Specify the location of the `initramfs` file that you uploaded to your HTTP
+the `coreos.inst.ignition_url` parameter value is the location of the bootstrap
+Ignition config file, and the `coreos.live.rootfs_url` parameter value is
+the location of the live `rootfs` file.
+<2> Specify the location of the `initramfs` file that you uploaded to your HTTP
 server.
 
 . Continue to create the machines for your cluster.