From a54e27fc9ca7a31a62fd79a6410384c4b6d1923dd6dea2680aab96ec9954399e Mon Sep 17 00:00:00 2001
From: Ignaz Forster <iforster@suse.com>
Date: Fri, 10 Jun 2022 22:25:46 +0000
Subject: [PATCH] Move ignition-rmcfg to /usr/sbin

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=96
---
 ignition-rmcfg-suse.conf | 2 +-
 ignition.spec            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ignition-rmcfg-suse.conf b/ignition-rmcfg-suse.conf
index c47b4aa..77f3aa4 100644
--- a/ignition-rmcfg-suse.conf
+++ b/ignition-rmcfg-suse.conf
@@ -5,5 +5,5 @@ ConditionKernelCommandLine=|ignition.firstboot
 
 [Service]
 ExecStart=
-ExecStart=/bin/bash -c 'if [ "${PLATFORM_ID}" = virtualbox -o "${PLATFORM_ID}" = vmware ]; then /usr/libexec/ignition-rmcfg --platform=${PLATFORM_ID}; fi'
+ExecStart=/bin/bash -c 'if [ "${PLATFORM_ID}" = virtualbox -o "${PLATFORM_ID}" = vmware ]; then /usr/sbin/ignition-rmcfg --platform=${PLATFORM_ID}; fi'
 
diff --git a/ignition.spec b/ignition.spec
index ba75426..e4cd4bf 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -110,11 +110,13 @@ env VERSION=%{version} GLDFLAGS='-X github.com/coreos/ignition/v2/internal/distr
 make -o all install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_sysconfdir}/grub.d
-install -d %{buildroot}%{_prefix}/lib/systemd/system
-install -d %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d
+install -d %{buildroot}%{_unitdir}/ignition-delete-config.service.d
 install -p -m 0755 grub/* %{buildroot}%{_sysconfdir}/grub.d/
 install -p -m 0644 systemd_suse/*.service %{buildroot}%{_prefix}/lib/systemd/system/
 install -p -m 0644 systemd_suse/ignition-delete-config.service.d/* %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d
+install -d %{buildroot}%{_sbindir}/
+mv %{buildroot}/usr/libexec/ignition-rmcfg %{buildroot}/%{_sbindir}/
+rmdir %{buildroot}/usr/libexec
 
 %pre
 %service_add_pre ignition-delete-config.service
@@ -170,8 +172,8 @@ fi
 /usr/lib/dracut/modules.d/30ignition
 /usr/lib/dracut/modules.d/30ignition-microos
 /usr/bin/ignition-validate
-/usr/libexec/ignition-rmcfg
 /usr/lib/systemd/system/ignition-delete-config.service
+%{_sbindir}/ignition-rmcfg
 %dir %{_unitdir}/ignition-delete-config.service.d
 %{_unitdir}/ignition-delete-config.service.d/ignition-rmcfg-suse.conf