From 5d93f37da810a56083a02113765037b6ffc79e69 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 15 May 2018 10:40:33 -0400 Subject: [PATCH] coreos-install: write Ignition config to magic OEM path Starting with Ignition 0.20.0, Container Linux will automatically use an Ignition config at /usr/share/oem/config.ign. Put the user-specified config there so we don't have to modify the kernel command line. --- bin/coreos-install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/coreos-install b/bin/coreos-install index df8c1e9..89a5ad3 100755 --- a/bin/coreos-install +++ b/bin/coreos-install @@ -605,8 +605,7 @@ function write_ignition() if [[ -n "${IGNITION}" ]]; then trap 'umount "${WORKDIR}/oemfs"' RETURN echo "Installing Ignition config ${IGNITION}..." - cp "${IGNITION}" "${WORKDIR}/oemfs/coreos-install.json" - echo 'set linux_append="$linux_append coreos.config.url=oem:///coreos-install.json"' >> "${WORKDIR}/oemfs/grub.cfg" + cp "${IGNITION}" "${WORKDIR}/oemfs/config.ign" fi WORKDIR=$(mktemp --tmpdir -d coreos-install.XXXXXXXXXX)