From 57e4c6741912a2081d18ee2903bdf7160d9d4baa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 10 Jan 2020 18:28:25 +0000 Subject: [PATCH] Don't enable machine-config-daemon-host.service by default Today the MCS serves both `/etc/pivot/image-pullspec` *and* `/etc/ignition-machine-config-encapsulated.json` - and we have to serve both so that using 4.1 bootimages works. However, we absolutely shouldn't start *both* services on a modern 4.3+ system on firstboot - they will race, both trying to update, and one doing a reboot. Only enable the `-firstboot.service` which will itself currently invoke `-host.service`, though in the future we should clean this up by having the firstboot code run rpm-ostree *directly*, since we're already on the host. Motivated by discussions around RT kernel handling. --- templates/common/_base/units/machine-config-daemon-host.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/_base/units/machine-config-daemon-host.service b/templates/common/_base/units/machine-config-daemon-host.service index b54879179a..16ac972194 100644 --- a/templates/common/_base/units/machine-config-daemon-host.service +++ b/templates/common/_base/units/machine-config-daemon-host.service @@ -1,5 +1,5 @@ name: "machine-config-daemon-host.service" -enabled: true +enabled: false contents: | [Unit] Description=Machine Config Daemon Initial