Fix order - *first* remount, *then* create directory. It seems upstream got that wrong...

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=126
This commit is contained in:
Ignaz Forster 2024-07-29 12:00:48 +00:00 committed by Git OBS Bridge
parent e4896c4ec7
commit e5bafd3cb3

View File

@ -11,9 +11,6 @@ copy_file_if_exists() {
fi fi
} }
destination=/usr/lib/ignition
mkdir -p $destination
# systemd v256 now runs the initrd with ProtectSystem=yes, which makes /usr # systemd v256 now runs the initrd with ProtectSystem=yes, which makes /usr
# read-only. Just remount it rw until we have: # read-only. Just remount it rw until we have:
# https://github.com/coreos/ignition/issues/1891 # https://github.com/coreos/ignition/issues/1891
@ -21,6 +18,9 @@ if [ ! -w /usr ]; then
mount -o rw,remount /usr mount -o rw,remount /usr
fi fi
destination=/usr/lib/ignition
mkdir -p $destination
if command -v is-live-image >/dev/null && is-live-image; then if command -v is-live-image >/dev/null && is-live-image; then
# Live image. If the user has supplied a config.ign via an appended # Live image. If the user has supplied a config.ign via an appended
# initrd, put it in the right place. # initrd, put it in the right place.