From 3efce2a821d408222004b1c94b71600a1c410f0a Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Thu, 25 Jun 2020 18:44:51 -0400 Subject: [PATCH] Use upstream's systemd service The source project formerly did not include a systemd unit file. It does now, so target.service can be removed. --- python-rtslib.spec | 3 +-- target.service | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 target.service diff --git a/python-rtslib.spec b/python-rtslib.spec index debb1f3..398dad4 100644 --- a/python-rtslib.spec +++ b/python-rtslib.spec @@ -10,7 +10,6 @@ Version: 2.1.fb69 Release: 9%{?dist} URL: https://github.com/open-iscsi/%{oname} Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz -Source1: target.service Patch0: 0001-disable-xen_pvscsi.patch BuildArch: noarch %if %{with apidocs} @@ -91,7 +90,7 @@ mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/target/backup mkdir -p %{buildroot}%{_localstatedir}/target/pr mkdir -p %{buildroot}%{_localstatedir}/target/alua -install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/target.service +install -m 644 systemd/target.service %{buildroot}%{_unitdir}/target.service install -m 644 doc/targetctl.8 %{buildroot}%{_mandir}/man8/ install -m 644 doc/saveconfig.json.5 %{buildroot}%{_mandir}/man5/ diff --git a/target.service b/target.service deleted file mode 100644 index aa0a51b..0000000 --- a/target.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Restore LIO kernel target configuration -Requires=sys-kernel-config.mount -After=sys-kernel-config.mount network.target local-fs.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/targetctl restore -ExecStop=/usr/bin/targetctl clear -SyslogIdentifier=target - -[Install] -WantedBy=multi-user.target -