From 0e435e85b452c332aa8364172fffd2db757145eb1952f7d0f7267fc599b62d33 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Tue, 13 Oct 2020 12:41:10 +0000 Subject: [PATCH] Accepting request 841447 from home:favogt:combustion - Also stop ignition-mount.service if there's no config OBS-URL: https://build.opensuse.org/request/show/841447 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/combustion?expand=0&rev=11 --- combustion | 10 +++++----- combustion.changes | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/combustion b/combustion index c13a752..dd42239 100644 --- a/combustion +++ b/combustion @@ -84,11 +84,6 @@ cleanup() { trap cleanup EXIT -if ! [ -d "${config_mount}/combustion" ]; then - echo "No config found - doing nothing." - exit 0 -fi - # ignition-mount.service mounts stuff below /sysroot in ExecStart and umounts # it on ExecStop, failing if umounting fails. This conflicts with the # mounts/umounts done by combustion. Ignition is already done, so just stop it. @@ -96,6 +91,11 @@ if systemctl --quiet is-active ignition-mount.service; then systemctl stop ignition-mount.service fi +if ! [ -d "${config_mount}/combustion" ]; then + echo "No config found - doing nothing." + exit 0 +fi + # Copy config mkdir "${exchangedir}" config_dir="${exchangedir}/config" diff --git a/combustion.changes b/combustion.changes index bdf662f..61eeb22 100644 --- a/combustion.changes +++ b/combustion.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 09:00:58 UTC 2020 - Fabian Vogt + +- Also stop ignition-mount.service if there's no config + ------------------------------------------------------------------- Tue Oct 6 10:19:57 UTC 2020 - Fabian Vogt