Accepting request 913198 from devel:kubic:ignition
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/913198 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=27
This commit is contained in:
commit
d95b10e0af
@ -11,6 +11,9 @@ Before=ignition-fetch-offline.service
|
||||
OnFailure=emergency.target
|
||||
OnFailureJobMode=isolate
|
||||
|
||||
Wants=dev-disk-by\x2dlabel-ignition.device
|
||||
After=dev-disk-by\x2dlabel-ignition.device
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
|
@ -11,17 +11,6 @@ set -e
|
||||
add_requires ignition-mount-initrd-fstab.service ignition-files.service
|
||||
add_requires ignition-enable-network.service ignition-fetch.service
|
||||
|
||||
if ! is-live-image; then
|
||||
# ignition-setup-user.service should depend on the boot device node
|
||||
# only on diskful boots
|
||||
mkdir -p "${UNIT_DIR}/ignition-setup-user.service.d"
|
||||
cat > "${UNIT_DIR}/ignition-setup-user.service.d/diskful.conf" <<EOF
|
||||
[Unit]
|
||||
Wants=dev-disk-by\x2dlabel-ignition.device
|
||||
After=dev-disk-by\x2dlabel-ignition.device
|
||||
EOF
|
||||
fi
|
||||
|
||||
if [ -z "${PLATFORM_ID}" ]; then
|
||||
platform="$(systemd-detect-virt || true)"
|
||||
case "${platform}" in
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 12 17:42:59 UTC 2021 - Ignaz Forster <iforster@suse.com>
|
||||
|
||||
- is-live-image doesn't exist on *SUSE, and our live images don't
|
||||
use Ignition, so just add the Ignition device dependency to the
|
||||
service file directly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 09 08:51:52 UTC 2021 - iforster@suse.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user