From ab7d7190d994e5674aed2377590db2f9ffd42e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 22 Apr 2016 08:49:48 -0400
Subject: [PATCH] UsrMove - convert device_cio_free systemd unit

---
 device_cio_free.service | 2 +-
 s390utils.spec          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device_cio_free.service b/device_cio_free.service
index b5d7e24..db9c020 100644
--- a/device_cio_free.service
+++ b/device_cio_free.service
@@ -6,5 +6,5 @@ Before=sysinit.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/sbin/device_cio_free
+ExecStart=/usr/sbin/device_cio_free
 StandardOutput=syslog
diff --git a/s390utils.spec b/s390utils.spec
index 7531749..c95777d 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -170,9 +170,9 @@ done
 popd
 mkdir -p ${RPM_BUILD_ROOT}/lib/systemd/system
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/systemd/system/sysinit.target.wants
-install -p -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}/lib/systemd/system
+install -p -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}%{_unitdir}
 pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/systemd/system/sysinit.target.wants
-ln -sf /lib/systemd/system/device_cio_free.service device_cio_free.service
+ln -sf %{_unitdir}/device_cio_free.service device_cio_free.service
 popd
 
 # ccw
@@ -469,7 +469,7 @@ fi
 %{_sbindir}/zfcp_cio_free
 %{_sbindir}/znet_cio_free
 %{_sbindir}/normalize_dasd_arg
-/lib/systemd/system/device_cio_free.service
+%{_unitdir}/device_cio_free.service
 %{_sysconfdir}/systemd/system/sysinit.target.wants/device_cio_free.service
 /usr/lib/udev/ccw_init
 %{_udevrulesdir}/40-z90crypt.rules