From ba88110f17cc7a1277389853d67509c1ab30504a Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Wed, 29 Oct 2014 15:23:09 +0900 Subject: [PATCH] disabled auto start Spice-vdagent will be dynamically started by qemu. Change-Id: Ibfdb0bb618043267c6ffe80fe67cf3738e67ab2e Signed-off-by: sungmin ha --- data/spice-vdagent.service | 3 --- data/spice-vdagentd.service | 8 ++------ packaging/spice-vdagent.spec | 14 +++++++++++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/data/spice-vdagent.service b/data/spice-vdagent.service index 47d5d70..767127c 100644 --- a/data/spice-vdagent.service +++ b/data/spice-vdagent.service @@ -5,6 +5,3 @@ Description=Agent for Spice guests Type=forking Environment=DISPLAY=:0 ExecStart=/usr/bin/spice-vdagent - -[Install] -WantedBy=emulator.target diff --git a/data/spice-vdagentd.service b/data/spice-vdagentd.service index 91ec247..6547fee 100644 --- a/data/spice-vdagentd.service +++ b/data/spice-vdagentd.service @@ -7,11 +7,7 @@ After=dbus.target [Service] Type=forking -EnvironmentFile=-/etc/sysconfig/spice-vdagentd +ExecStartPre=/bin/mkdir -p /tmp/spice-vdagentd/ ExecStartPre=/bin/rm -f /tmp/spice-vdagentd/spice-vdagent-sock -ExecStart=/usr/sbin/spice-vdagentd $SPICE_VDAGENTD_EXTRA_ARGS; +ExecStart=/usr/sbin/spice-vdagentd PIDFile=/tmp/spice-vdagentd/spice-vdagentd.pid -PrivateTmp=true - -[Install] -WantedBy=emulator.target diff --git a/packaging/spice-vdagent.spec b/packaging/spice-vdagent.spec index 0c6cef1..335d06f 100644 --- a/packaging/spice-vdagent.spec +++ b/packaging/spice-vdagent.spec @@ -1,5 +1,5 @@ Name: spice-vdagent -Version: 0.15.1 +Version: 0.15.2 Release: 1 Summary: This is used for spice input communication License: GPL-3.0 @@ -24,6 +24,16 @@ BuildRequires: spice-protocol make %install +rm -rf %{buildroot} + +if [ ! -d %{buildroot}/usr/lib/systemd/system ]; then + mkdir -p %{buildroot}/usr/lib/systemd/system +fi + +cp data/spice-vdagentd.service %{buildroot}/usr/lib/systemd/system/. +cp data/spice-vdagent.service %{buildroot}/usr/lib/systemd/system/. + +%make_install %clean make clean @@ -39,6 +49,8 @@ rm -rf install_manifest.txt %files %defattr(-,root,root,-) +/usr/lib/systemd/system/spice-vdagent.service +/usr/lib/systemd/system/spice-vdagentd.service /usr/bin/spice-vdagent /usr/etc/rsyslog.d/spice-vdagentd.conf /usr/etc/xdg/autostart/spice-vdagent.desktop -- 2.7.4