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

- is-live-image doesn't exist on *SUSE, and our live images don't

Browse Source 
use Ignition, so just add the Ignition device dependency to the
  service file directly.

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=80
This commit is contained in:
Ignaz Forster 2021-08-12 17:47:02 +00:00 committed by Git OBS Bridge
parent 406cbf31e8
commit 35d7b6c402
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ignition-setup-user.service
View File

@ -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
ignition-suse-generator
View File

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

7
ignition.changes
View File

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