From 60460da4e026b88f93df94f119ace6f871e8eb2ef77bdca6fe915fc2fbc52e1a Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Thu, 8 Jul 2021 11:18:19 +0000 Subject: [PATCH] - If a Combustion device was mounted, then unmount it in ignition-kargs-helper - the replacement script will be put on the same location OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=75 --- ignition-kargs-helper | 9 +++++++++ ignition.changes | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/ignition-kargs-helper b/ignition-kargs-helper index b266eb0..22e8934 100644 --- a/ignition-kargs-helper +++ b/ignition-kargs-helper @@ -51,6 +51,15 @@ kernelopts="$(echo "$kernelopts" | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]* # only apply the changes & reboot if changes have been made if [[ "$kernelopts" != "$orig_kernelopts" ]]; then combustiondir="/run/combustion/mount/combustion" + # The Combustion script may be located on an external device; if so the + # device is guaranteed to mounted here already: + # combustion-prepare: Before=dracutinitqueue.service + # ignition-fetch: After=basic.target + # Unmount the device, as the new Combustion script will be put at the + # same location below. + if findmnt "${combustiondir}"/.. >/dev/null; then + umount "${combustiondir}"/.. + fi mkdir -p "${combustiondir}" # escape escapes to survive the multiple shell invocations kernelopts="${kernelopts//\\/\\\\\\\\}" diff --git a/ignition.changes b/ignition.changes index ea2d78b..de40eaa 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 8 10:47:50 UTC 2021 - Ignaz Forster + +- If a Combustion device was mounted, then unmount it in + ignition-kargs-helper - the replacement script will be put on + the same location + ------------------------------------------------------------------- Wed Jul 07 16:39:04 UTC 2021 - iforster@suse.com