From ea7b4917018faa5dd51394b650658c15bbdea926 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 14 Jan 2020 16:55:52 -0500 Subject: [PATCH 1/3] bare-metal: target stable stream We're stable now! --- modules/ROOT/pages/bare-metal.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ROOT/pages/bare-metal.adoc b/modules/ROOT/pages/bare-metal.adoc index 7ca69b91..4e7d98d5 100644 --- a/modules/ROOT/pages/bare-metal.adoc +++ b/modules/ROOT/pages/bare-metal.adoc @@ -22,7 +22,7 @@ NOTE: You can install in either legacy boot (BIOS) mode or in UEFI mode, regardl . From the boot menu, press `` (isolinux) or `e` (grub) to edit the kernel command line. . Add the following parameters to the kernel command line: * `coreos.inst.install_dev=/dev/sda` -* `coreos.inst.stream=testing` +* `coreos.inst.stream=stable` * `coreos.inst.ignition_url=http://example.com/config.ign` * `coreos.inst.platform_id=qemu` . Press `` (isolinux) or `` (grub) to start the installation. @@ -46,7 +46,7 @@ TIMEOUT 20 PROMPT 0 LABEL pxeboot KERNEL fedora-coreos-30.20191014.1-live-kernel-x86_64 - APPEND ip=dhcp rd.neednet=1 initrd=fedora-coreos-30.20191014.1-live-initramfs.x86_64.img console=tty0 console=ttyS0 coreos.inst.install_dev=/dev/sda coreos.inst.stream=testing coreos.inst.ignition_url=http://192.168.1.101:8000/config.ign + APPEND ip=dhcp rd.neednet=1 initrd=fedora-coreos-30.20191014.1-live-initramfs.x86_64.img console=tty0 console=ttyS0 coreos.inst.install_dev=/dev/sda coreos.inst.stream=stable coreos.inst.ignition_url=http://192.168.1.101:8000/config.ign IPAPPEND 2 ---- From e4ab341d178cc616eec507ba52c08808b8102d90 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 14 Jan 2020 16:56:08 -0500 Subject: [PATCH 2/3] bare-metal: drop coreos.inst.platform_id=qemu arg We're installing on metal, so we want the config to be fetched from the location we injected it to. The installer defaults to metal. --- modules/ROOT/pages/bare-metal.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/ROOT/pages/bare-metal.adoc b/modules/ROOT/pages/bare-metal.adoc index 4e7d98d5..59862b83 100644 --- a/modules/ROOT/pages/bare-metal.adoc +++ b/modules/ROOT/pages/bare-metal.adoc @@ -24,7 +24,6 @@ NOTE: You can install in either legacy boot (BIOS) mode or in UEFI mode, regardl * `coreos.inst.install_dev=/dev/sda` * `coreos.inst.stream=stable` * `coreos.inst.ignition_url=http://example.com/config.ign` -* `coreos.inst.platform_id=qemu` . Press `` (isolinux) or `` (grub) to start the installation. Once the installation is complete, the machine reboots. After rebooting, the first boot process begins. It is at this time that Ignition ingests the configuration file and provisions the system as specified. From 19ffc56b1ffe3b4f5ac3c8b37df388421e5984f0 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 14 Jan 2020 17:00:27 -0500 Subject: [PATCH 3/3] Some minor wording tweaks --- modules/ROOT/pages/bare-metal.adoc | 2 +- modules/ROOT/pages/getting-started.adoc | 2 +- modules/ROOT/pages/ign-systemd.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ROOT/pages/bare-metal.adoc b/modules/ROOT/pages/bare-metal.adoc index 59862b83..943cfce6 100644 --- a/modules/ROOT/pages/bare-metal.adoc +++ b/modules/ROOT/pages/bare-metal.adoc @@ -49,4 +49,4 @@ LABEL pxeboot IPAPPEND 2 ---- -For more details on how to use this information, see the https://dustymabe.com/2019/01/04/easy-pxe-boot-testing-with-only-http-using-ipxe-and-libvirt/[instructions] for testing a PXE installation via a local VM and `libvirt`. +For more details on how to use this information, see this https://dustymabe.com/2019/01/04/easy-pxe-boot-testing-with-only-http-using-ipxe-and-libvirt/[blog post] for testing a PXE installation via a local VM and `libvirt`. diff --git a/modules/ROOT/pages/getting-started.adoc b/modules/ROOT/pages/getting-started.adoc index 6dfa9c69..7fb45d6f 100644 --- a/modules/ROOT/pages/getting-started.adoc +++ b/modules/ROOT/pages/getting-started.adoc @@ -53,7 +53,7 @@ qemu-system-x86_64 -machine accel=kvm -m 2048 -cpu host -nographic \ .Example launching FCOS with virt-install [source, bash] ---- -virt-install -n fcos --vcpus 2 -r 2048 --os-variant=fedora30 --import --network bridge=virbr0 --disk=/var/lib/libvirt/images/fedora-coreos-30.20190905.0-qemu.qcow2,format=qcow2,bus=virtio --noautoconsole --qemu-commandline="-fw_cfg name=opt/com.coreos/config,file=/path/to/example.ign" +virt-install -n fcos --vcpus 2 -r 2048 --os-variant=fedora31 --import --network bridge=virbr0 --disk=/var/lib/libvirt/images/fedora-coreos-30.20190905.0-qemu.qcow2,format=qcow2,bus=virtio --noautoconsole --qemu-commandline="-fw_cfg name=opt/com.coreos/config,file=/path/to/example.ign" ---- + Once the VM has finished booting, its IP addresses will appear on the serial console. diff --git a/modules/ROOT/pages/ign-systemd.adoc b/modules/ROOT/pages/ign-systemd.adoc index 92c9bc0d..1db7f4a1 100644 --- a/modules/ROOT/pages/ign-systemd.adoc +++ b/modules/ROOT/pages/ign-systemd.adoc @@ -7,7 +7,7 @@ The `systemd` node of an FCC file allows you to add and configure https://www.fr The `systemd` node contains one top-level node: a list of units. For each unit, the following options are available: -* `name` (string, required, must be unique): the full name of the unit the form of `thing.service`. +* `name` (string, required, must be unique): the full name of the unit in the form of `thing.service`. * `enabled` (boolean): When set to `true`, the unit is enabled. By default, the service is unmodified. For a unit to run, it must have an `[Install]` section. * `mask` (boolean): determines whether the unit is masked. When set to `true`, the service is masked by a symlink to `/dev/null`. * `contents` (string): the contents of the unit.