From a9a643929f1b35a5c9d7316cacaa5185a0bed1ce Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 5 Jun 2024 15:48:05 -0400 Subject: [PATCH] fixtures/customize/dest: update unit to use console.cfg With the changeover to OSBuild, GRUB configs are handled slightly diffrently. Update butane and ignition files to reflect that. fixes #1479 --- fixtures/customize/dest.bu | 2 +- fixtures/customize/dest.ign | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fixtures/customize/dest.bu b/fixtures/customize/dest.bu index c33a1819d..139ee4c1b 100644 --- a/fixtures/customize/dest.bu +++ b/fixtures/customize/dest.bu @@ -23,7 +23,7 @@ systemd: [Service] Type=oneshot RemainAfterExit=true - ExecStart=/bin/grep -qz 'serial --unit=0 --speed=115200 --word=8 --parity=no.terminal_input serial.terminal_output serial.#' /boot/grub2/grub.cfg + ExecStart=/bin/grep -qz 'serial --unit=0 --speed=115200 --word=8 --parity=no.terminal_input serial.terminal_output serial.#' /boot/grub2/console.cfg ExecStart=/bin/echo @applied-dest-ign@ StandardOutput=tty diff --git a/fixtures/customize/dest.ign b/fixtures/customize/dest.ign index 37425d002..2f8f45852 100644 --- a/fixtures/customize/dest.ign +++ b/fixtures/customize/dest.ign @@ -5,7 +5,7 @@ "systemd": { "units": [ { - "contents": "[Unit]\nDescription=Dest Ignition Applied\nBefore=multi-user.target\nConditionPathExists=/etc/NetworkManager/system-connections/installer-test.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-js-eth1.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-js-eth2.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-yl-eth1.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-yl-eth2.nmconnection\nConditionKernelCommandLine=install-config-karg-1\nConditionKernelCommandLine=install-config-karg-2\nConditionKernelCommandLine=dest-karg\nConditionKernelCommandLine=!ignition.platform.id=metal\nConditionKernelCommandLine=ignition.platform.id=qemu\nConditionKernelCommandLine=console=ttyS0,115200n8\n\n[Service]\nType=oneshot\nRemainAfterExit=true\nExecStart=/bin/grep -qz 'serial --unit=0 --speed=115200 --word=8 --parity=no.terminal_input serial.terminal_output serial.#' /boot/grub2/grub.cfg\nExecStart=/bin/echo @applied-dest-ign@\nStandardOutput=tty\n\n[Install]\nRequiredBy=multi-user.target\n", + "contents": "[Unit]\nDescription=Dest Ignition Applied\nBefore=multi-user.target\nConditionPathExists=/etc/NetworkManager/system-connections/installer-test.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-js-eth1.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-js-eth2.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-yl-eth1.nmconnection\nConditionPathExists=/etc/NetworkManager/system-connections/nmstate-yl-eth2.nmconnection\nConditionKernelCommandLine=install-config-karg-1\nConditionKernelCommandLine=install-config-karg-2\nConditionKernelCommandLine=dest-karg\nConditionKernelCommandLine=!ignition.platform.id=metal\nConditionKernelCommandLine=ignition.platform.id=qemu\nConditionKernelCommandLine=console=ttyS0,115200n8\n\n[Service]\nType=oneshot\nRemainAfterExit=true\nExecStart=/bin/grep -qz 'serial --unit=0 --speed=115200 --word=8 --parity=no.terminal_input serial.terminal_output serial.#' /boot/grub2/console.cfg\nExecStart=/bin/echo @applied-dest-ign@\nStandardOutput=tty\n\n[Install]\nRequiredBy=multi-user.target\n", "enabled": true, "name": "dest-ignition-applied.service" }