On Fri, Jan 04, 2013 at 03:36:46PM -0700, Eric Blake wrote:
virtlockd.service could be installed to a configurable root, but virtlockd.socket was hardcoded to installation into a distro.
* src/Makefile.am (virtlockd.service, virtlockd.socket): Drop unused substitutions. * src/locking/virtlockd.socket.in (ListenStream): Don't hard-code /var. --- src/Makefile.am | 4 ---- src/locking/virtlockd.socket.in | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am index 0cc02ed..ba685bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1707,9 +1707,7 @@ endif
virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ @@ -1717,8 +1715,6 @@ virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in index 0589a29..a6eef4f 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -2,7 +2,7 @@ Description=Virtual machine lock manager socket
[Socket] -ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock +ListenStream=@localstatedir@/run/libvirt/virtlockd/virtlockd.sock
[Install] WantedBy=multi-user.target
ACK -- Guido
-- 1.8.0.2
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list