From d2a11492d9bbfebdea31ec477d62dc747af0510c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>

Date: Mon, 5 May 2014 15:44:30 +0200

Subject: [PATCH] webdavd: remove systemd target, use only service

https://bugzilla.redhat.com/show_bug.cgi?id=1087907

---

 Makefile.am                 | 2 +-

 data/70-spice-webdavd.rules | 2 +-

 data/spice-webdavd.service  | 3 ---

 data/spice-webdavd.target   | 2 --

 4 files changed, 2 insertions(+), 7 deletions(-)

 delete mode 100644 data/spice-webdavd.target

diff --git a/Makefile.am b/Makefile.am

index e9ce4a7..680371d 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -142,7 +142,7 @@ if HAVE_SYSTEMD

 systemdunitdir = $(SYSTEMDSYSTEMUNITDIR)

 dist_systemdunit_DATA = \

 	$(top_srcdir)/data/spice-webdavd.service \

-	$(top_srcdir)/data/spice-webdavd.target

+	$(NULL)

 endif

 if HAVE_UDEV

diff --git a/data/70-spice-webdavd.rules b/data/70-spice-webdavd.rules

index 0088be3..0fd894d 100644

--- a/data/70-spice-webdavd.rules

+++ b/data/70-spice-webdavd.rules

@@ -1 +1 @@

-ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.target"

+ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.service"

diff --git a/data/spice-webdavd.service b/data/spice-webdavd.service

index 328a84d..a7c3104 100644

--- a/data/spice-webdavd.service

+++ b/data/spice-webdavd.service

@@ -8,6 +8,3 @@ Type=simple

 EnvironmentFile=-/etc/sysconfig/spice-webdavd

 ExecStart=/usr/sbin/spice-webdavd -p 9843 $SPICE_WEBDAVD_EXTRA_ARGS

 Restart=on-success

-

-[Install]

-WantedBy=spice-webdavd.target

diff --git a/data/spice-webdavd.target b/data/spice-webdavd.target

deleted file mode 100644

index 7417025..0000000

--- a/data/spice-webdavd.target

+++ /dev/null

@@ -1,2 +0,0 @@

-[Unit]

-Description=webdav daemon for Spice guests

-- 

1.8.5.3