diff --git a/docs/rhcos-oci-braindump.md b/docs/rhcos-oci-braindump.md index c7b116861..459c72dab 100644 --- a/docs/rhcos-oci-braindump.md +++ b/docs/rhcos-oci-braindump.md @@ -77,7 +77,7 @@ mechanism. This allows one to inject an arbitrary path from a pre-built container into the build context of another container. In particular, OpenShift Image Builds does this by creating a temporary directory at `/tmp/build/inputs/` for each image input ([source](https://github.com/openshift/builder/blob/37525a77fa07e26c420962dee47193d672ef0b35/pkg/build/builder/common.go#L72)) and parsing the Dockerfile to replace any references to the relative path with the absolute path. +path>` for each image input ([source](https://github.com/openshift/builder/blob/37525a77fa07e26c420962dee47193d672ef0b35/pkg/build/builder/common.go#L72)) and parsing the Dockerfile to replace any references to the relative path with the absolute path. ### Buildah @@ -142,12 +142,12 @@ images: This works thusly: 1. Build the `build-test-qemu-img` from the `ci/Dockerfile` present in this repository. This copies in all of the scripts and configs as well as builds the -OS layering test binary. +OS layering test binary. 1. We build the `cosa-build` container which effectively takes the `build-test-qemu-img` and runs `cosa fetch && cosa build` as part of a container image build. This produces the OCI archive within `$COSA_DIR/builds/latest/x86_64/rhcos.ociarchive`. -1. We use this image as the input for the `machine-os-oci-content` image. +1. We use this image as the input for the `machine-os-oci-content` image. A downside of this mechanism is that the resulting container size for `cosa-build` is 20+ GB on-disk when the resulting on-disk size of the RHCOS OCI @@ -169,7 +169,7 @@ images: # We copy the built OCI archive into the mounted build context. RUN --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared cp "${COSA_DIR}/builds/latest/x86_64/rhcos.x86_64.ociarchive" "/buildcontext/rhcos.x86_64.ociarchive" - + # Since we can mutate the build context and we know where the OpenShift # Image Builder injects it into the build pod, we can take advantage of the # mutated build context thusly. @@ -187,7 +187,7 @@ images: to: machine-oci-os-content ``` -What is nice about the future solution is that we can largely bypass having to pass around a 20+ GB image since the final image will be around 2.75 GB or so. +What is nice about the future solution is that we can largely bypass having to pass around a 20+ GB image since the final image will be around 2.75 GB or so. ### Far-Future Solution diff --git a/live/README-devel.md b/live/README-devel.md index 6a123986f..373b17ff1 100644 --- a/live/README-devel.md +++ b/live/README-devel.md @@ -1,7 +1,7 @@ These files will be copied to the target live ISO via the CoreOS Assembler buildextend-live call. It picks up all files in the coreos/fedora-coreos-config/live/ -directory and copies them to the base of the ISO. +directory and copies them to the base of the ISO. Files currently copied are: @@ -10,4 +10,4 @@ Files currently copied are: Files that get copied into efiboot.img in the ISO: -- EFI/grub.cfg +- EFI/grub.cfg diff --git a/live/isolinux/isolinux.cfg b/live/isolinux/isolinux.cfg index 8889c4fc3..e87db9509 100644 --- a/live/isolinux/isolinux.cfg +++ b/live/isolinux/isolinux.cfg @@ -1,4 +1,4 @@ -# Note this file mostly matches the isolinux.cfg file from the Fedora +# Note this file mostly matches the isolinux.cfg file from the Fedora # Server DVD iso. Diff this file with that file in the future to pick up # changes. serial 0 diff --git a/overlay.d/05rhcos/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf b/overlay.d/05rhcos/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf index 5cd7ee520..19a7d015f 100644 --- a/overlay.d/05rhcos/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf +++ b/overlay.d/05rhcos/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf @@ -1,4 +1,4 @@ -# Prefer keyfiles by listing the keyfile plugin first in the plugin list. This +# Prefer keyfiles by listing the keyfile plugin first in the plugin list. This # overrides the default plugins and will cause any new networking configuration # written by NetworkManager in RHCOS to be written out to keyfiles instead of # ifcfg files. User's can still bring their own ifcfg files and they will still diff --git a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/module-setup.sh b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/module-setup.sh index 26e3475a4..f5bca3b70 100644 --- a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/module-setup.sh +++ b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/module-setup.sh @@ -13,6 +13,6 @@ install_unit() { install() { inst_script "$moddir/rhcos-fail-boot-for-legacy-luks-config" \ "/usr/libexec/rhcos-fail-boot-for-legacy-luks-config" - + install_unit rhcos-fail-boot-for-legacy-luks-config.service } diff --git a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config index 444259c21..856ef607a 100755 --- a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config +++ b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config @@ -1,8 +1,8 @@ #!/bin/bash set -euo pipefail -# This script tries to look for a `files` entry with the `/etc/clevis.json` -# path (used to enable LUKS in RHCOS 4.6 or earlier versions) in an +# This script tries to look for a `files` entry with the `/etc/clevis.json` +# path (used to enable LUKS in RHCOS 4.6 or earlier versions) in an # Ignition config. If it exists, then the script ends with exit 1. ignition_cfg="/run/ignition.json" @@ -11,8 +11,8 @@ wanted_path="/etc/clevis.json" # select the `/etc/clevis.json` entry from a given Ignition config if jq -e ".storage.files[]? | select(.path==\"${wanted_path}\")" "${ignition_cfg}" > /dev/null; then echo "Your Ignition config specifies LUKS filesystem encryption using the obsolete -${wanted_path} config file, which is no longer supported. Refusing to boot. -Please refer to https://github.com/openshift/openshift-docs/pull/27661 for more +${wanted_path} config file, which is no longer supported. Refusing to boot. +Please refer to https://github.com/openshift/openshift-docs/pull/27661 for more information." exit 1 fi diff --git a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config.service b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config.service index 71361843a..d63bd8f28 100644 --- a/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config.service +++ b/overlay.d/05rhcos/usr/lib/dracut/modules.d/41rhcos-check-luks-syntax/rhcos-fail-boot-for-legacy-luks-config.service @@ -1,6 +1,5 @@ -# Fail the boot if the user tries to use the legacy -# LUKS configuration in an Ignition config to enable -# LUKS in RHCOS, so they don't accidentally end up +# Fail the boot if the user tries to use the legacy LUKS configuration in an +# Ignition config to enable LUKS in RHCOS, so they don't accidentally end up # with an unencrypted system. [Unit] Description=RHCOS Check For Legacy LUKS Configuration diff --git a/overlay.d/06gcp-routes/usr/sbin/gcp-routes.sh b/overlay.d/06gcp-routes/usr/sbin/gcp-routes.sh index d069ddae3..5876fe56f 100755 --- a/overlay.d/06gcp-routes/usr/sbin/gcp-routes.sh +++ b/overlay.d/06gcp-routes/usr/sbin/gcp-routes.sh @@ -2,7 +2,7 @@ # Update iptables rules based on google cloud load balancer VIPS # -# This is needed because the GCP L3 load balancer doesn't actually do DNAT; +# This is needed because the GCP L3 load balancer doesn't actually do DNAT; # the destination IP address is still the VIP. Normally, there is an agent that # adds the vip to the local routing table, tricking the kernel in to thinking # it's a local IP and allowing processes doing an accept(0.0.0.0) to receive diff --git a/tests/kola/version/rhel-major-version b/tests/kola/version/rhel-major-version index 8c01c5e3e..95e932937 100755 --- a/tests/kola/version/rhel-major-version +++ b/tests/kola/version/rhel-major-version @@ -9,10 +9,10 @@ fatal() { # checks to ensure that the only packages from the RHEL major version are included -source /etc/os-release +source /etc/os-release var=$(echo "${RHEL_VERSION}" | cut -d. -f1) for x in $(rpm -qa --queryformat='%{RELEASE}\n' | grep -oP 'el\s*\K\d+'); do - if [[ "$var" -ne $((x)) ]]; then + if [[ "$var" -ne $((x)) ]]; then fatal "Error RHEL packages do not match current version" fi done