From 35d7b6c40237bb648f5887ed1b65b6365e1812690f729653c8ef132ee81dfe74 Mon Sep 17 00:00:00 2001
From: Ignaz Forster <iforster@suse.com>
Date: Thu, 12 Aug 2021 17:47:02 +0000
Subject: [PATCH] - 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.

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=80
---
 ignition-setup-user.service |  3 +++
 ignition-suse-generator     | 11 -----------
 ignition.changes            |  7 +++++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ignition-setup-user.service b/ignition-setup-user.service
index a011f12..c960952 100644
--- a/ignition-setup-user.service
+++ b/ignition-setup-user.service
@@ -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
diff --git a/ignition-suse-generator b/ignition-suse-generator
index 3b5e1ad..2014f92 100644
--- a/ignition-suse-generator
+++ b/ignition-suse-generator
@@ -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
diff --git a/ignition.changes b/ignition.changes
index 70624e9..f054440 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -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