SHA256
1
0
forked from pool/ignition

- 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
This commit is contained in:
Ignaz Forster 2021-07-08 11:18:19 +00:00 committed by Git OBS Bridge
parent 1d10eb3817
commit 60460da4e0
2 changed files with 16 additions and 0 deletions

View File

@ -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//\\/\\\\\\\\}"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 8 10:47:50 UTC 2021 - Ignaz Forster <iforster@suse.com>
- 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