pool/combustion
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 841447 from home:favogt:combustion

Browse Source 
- 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
This commit is contained in:
Ignaz Forster 2020-10-13 12:41:10 +00:00 committed by Git OBS Bridge
parent 3a12418b0e
commit 0e435e85b4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
combustion
View File

@ -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"

5
combustion.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 13 09:00:58 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Also stop ignition-mount.service if there's no config
-------------------------------------------------------------------
Tue Oct 6 10:19:57 UTC 2020 - Fabian Vogt <fvogt@suse.com>