4:05 p.m.
since they're not scripts but systemd service files.
---
src/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index f7a9b91..0cfc1ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1687,9 +1687,9 @@ DISTCLEANFILES += virtlockd.service virtlockd.socket
install-systemd: virtlockd.service virtlockd.socket install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
- $(INSTALL_SCRIPT) virtlockd.service \
+ $(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- $(INSTALL_SCRIPT) virtlockd.socket \
+ $(INSTALL_DATA) virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
--
1.7.10.4
5:37 p.m.
On 01/03/2013 03:05 PM, Guido Günther wrote:
since they're not scripts but systemd service files.
---
src/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
ACK.
diff --git a/src/Makefile.am b/src/Makefile.am
index f7a9b91..0cfc1ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1687,9 +1687,9 @@ DISTCLEANFILES += virtlockd.service virtlockd.socket
install-systemd: virtlockd.service virtlockd.socket install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
- $(INSTALL_SCRIPT) virtlockd.service \
+ $(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- $(INSTALL_SCRIPT) virtlockd.socket \
+ $(INSTALL_DATA) virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
4:48 a.m.
On Thu, Jan 03, 2013 at 04:37:51PM -0700, Eric Blake wrote:
On 01/03/2013 03:05 PM, Guido Günther wrote:
> since they're not scripts but systemd service files.
> ---
> src/Makefile.am | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
ACK.
Pushed. Thanks,
-- Guido
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index f7a9b91..0cfc1ed 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1687,9 +1687,9 @@ DISTCLEANFILES += virtlockd.service virtlockd.socket
>
> install-systemd: virtlockd.service virtlockd.socket install-sysconfig
> $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
> - $(INSTALL_SCRIPT) virtlockd.service \
> + $(INSTALL_DATA) virtlockd.service \
> $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
> - $(INSTALL_SCRIPT) virtlockd.socket \
> + $(INSTALL_DATA) virtlockd.socket \
> $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
>
> uninstall-systemd: uninstall-sysconfig
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
2:32 p.m.
On 01/03/2013 03:05 PM, Guido Günther wrote:
since they're not scripts but systemd service files.
---
src/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index f7a9b91..0cfc1ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1687,9 +1687,9 @@ DISTCLEANFILES += virtlockd.service virtlockd.socket
install-systemd: virtlockd.service virtlockd.socket install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
- $(INSTALL_SCRIPT) virtlockd.service \
+ $(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- $(INSTALL_SCRIPT) virtlockd.socket \
+ $(INSTALL_DATA) virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
Hmm. This needs a followup - we don't need chmod a+x when creating
these files. For that matter, since virtlockd.socket has no
substitutions being made on it, we could install it directly instead of
going through a .in file.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
10:02 a.m.
New subject: [libvirt] [PATCH] No need to use a .in file for virtlockd.socket
since there are no substitutions in it.
---
src/Makefile.am | 10 +++++-----
src/locking/virtlockd.socket | 8 ++++++++
src/locking/virtlockd.socket.in | 8 --------
3 files changed, 13 insertions(+), 13 deletions(-)
create mode 100644 src/locking/virtlockd.socket
delete mode 100644 src/locking/virtlockd.socket.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 955973e..d573c6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1675,21 +1675,21 @@ virtlockd.init: locking/virtlockd.init.in
$(top_builddir)/config.status
-EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket.in
+EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = /lib/systemd/system
-BUILT_SOURCES += virtlockd.service virtlockd.socket
-DISTCLEANFILES += virtlockd.service virtlockd.socket
+BUILT_SOURCES += virtlockd.service
+DISTCLEANFILES += virtlockd.service
-install-systemd: virtlockd.service virtlockd.socket install-sysconfig
+install-systemd: virtlockd.service install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- $(INSTALL_DATA) virtlockd.socket \
+ $(INSTALL_DATA) locking/virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
diff --git a/src/locking/virtlockd.socket b/src/locking/virtlockd.socket
new file mode 100644
index 0000000..0589a29
--- /dev/null
+++ b/src/locking/virtlockd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Virtual machine lock manager socket
+
+[Socket]
+ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
deleted file mode 100644
index 0589a29..0000000
--- a/src/locking/virtlockd.socket.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Virtual machine lock manager socket
-
-[Socket]
-ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
-
-[Install]
-WantedBy=multi-user.target
--
1.7.10.4
12:21 p.m.
New subject: [libvirt] [PATCH] No need to use a .in file for virtlockd.socket
Guido Günther wrote:
since there are no substitutions in it.
Eric has since sent a patch that adds a substitution
https://www.redhat.com/archives/libvir-list/2013-January/msg00226.html
Regards,
Jim
---
src/Makefile.am | 10 +++++-----
src/locking/virtlockd.socket | 8 ++++++++
src/locking/virtlockd.socket.in | 8 --------
3 files changed, 13 insertions(+), 13 deletions(-)
create mode 100644 src/locking/virtlockd.socket
delete mode 100644 src/locking/virtlockd.socket.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 955973e..d573c6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1675,21 +1675,21 @@ virtlockd.init: locking/virtlockd.init.in
$(top_builddir)/config.status
-EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket.in
+EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = /lib/systemd/system
-BUILT_SOURCES += virtlockd.service virtlockd.socket
-DISTCLEANFILES += virtlockd.service virtlockd.socket
+BUILT_SOURCES += virtlockd.service
+DISTCLEANFILES += virtlockd.service
-install-systemd: virtlockd.service virtlockd.socket install-sysconfig
+install-systemd: virtlockd.service install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- $(INSTALL_DATA) virtlockd.socket \
+ $(INSTALL_DATA) locking/virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
diff --git a/src/locking/virtlockd.socket b/src/locking/virtlockd.socket
new file mode 100644
index 0000000..0589a29
--- /dev/null
+++ b/src/locking/virtlockd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Virtual machine lock manager socket
+
+[Socket]
+ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
deleted file mode 100644
index 0589a29..0000000
--- a/src/locking/virtlockd.socket.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Virtual machine lock manager socket
-
-[Socket]
-ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
-
-[Install]
-WantedBy=multi-user.target
4340
days inactive
4342
days old
5 comments
3 participants
participants (3)
-
Eric Blake -
Guido Günther -
Jim Fehlig