Skip to content

Fix merge conflict with PR#26070 and PR#26521 typo in 4-7 #29116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobfuru merged 1 commit into from
Feb 3, 2021
Merged

Fix merge conflict with PR#26070 and PR#26521 typo in 4-7 #29116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/installation-user-infra-machines-static-network.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:bond0:none
|===

[discrete]
== `core.inst` boot options for ISO or PXE install
== `coreos.inst` boot options for ISO or PXE install

While you can pass most standard installation boot arguments to the live installer, there are several arguments that are specific to the {op-system} live installer.

Expand All @@ -107,7 +107,7 @@ While you can pass most standard installation boot arguments to the live install

The following table shows the {op-system} live installer boot options for ISO and PXE installs.

.`core.inst` boot options
.`coreos.inst` boot options
[source,adoc]
|===
|Argument |Description
Expand Down