From a22939cb1d86b3589b73452b5f0fcd0eef546796831494464461ff5a9048e999 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Mon, 14 Sep 2020 09:24:15 +0000 Subject: [PATCH] Accepting request 834260 from home:fos:branches:devel:kubic:ignition - Avoid concurrent run of Ignition and Combustion initialization scripts to a avoid a duplicate mount of the same device. OBS-URL: https://build.opensuse.org/request/show/834260 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/combustion?expand=0&rev=5 --- combustion-prepare.service | 5 +++++ combustion.changes | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/combustion-prepare.service b/combustion-prepare.service index 4bf524c..81333cb 100644 --- a/combustion-prepare.service +++ b/combustion-prepare.service @@ -8,6 +8,11 @@ ConditionKernelCommandLine=ignition.firstboot Wants=dev-disk-by\x2dlabel-ignition.device After=dev-disk-by\x2dlabel-ignition.device +# If both Ignition and Combustion are active make sure to run their +# configuration scripts sequentially, as both try to mount the configuration +# device +After=ignition-setup-user.service + # This reconfigures networking, which runs during the initqueue Before=dracut-initqueue.service diff --git a/combustion.changes b/combustion.changes index 4a48e2f..757bcc4 100644 --- a/combustion.changes +++ b/combustion.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 14 09:20:49 UTC 2020 - Ignaz Forster + +- Avoid concurrent run of Ignition and Combustion initialization + scripts to a avoid a duplicate mount of the same device. + ------------------------------------------------------------------- Fri Sep 4 14:27:17 UTC 2020 - Fabian Vogt