From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has uploaded a new change for review.
Change subject: place libvirt_password under static ......................................................................
place libvirt_password under static
Change-Id: I5c9effb4cf7499a6d6f231303ac3b46aab8ff536 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M static/Makefile.am R static/etc/pki/vdsm/keys/libvirt_password M vdsm/Makefile.am 3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/78548/1
diff --git a/static/Makefile.am b/static/Makefile.am index a6851e3..73c9348 100644 --- a/static/Makefile.am +++ b/static/Makefile.am @@ -108,6 +108,9 @@ ./etc/modprobe.d/vdsm-bonding-modprobe.conf \ $(NULL)
+libvirtpassworddir = $(vdsmtsdir)/keys +libvirtpassword_DATA = ./$(libvirtpassworddir)/libvirt_password + networkmanagerdir = $(sysconfdir)/NetworkManager/conf.d
networkmanager_DATA = \ @@ -141,6 +144,7 @@ $(NULL)
EXTRA_DIST = \ + $(libvirtpassword_DATA) \ $(limits_DATA) \ $(modprobe_DATA) \ $(modulesload_DATA) \ diff --git a/vdsm/libvirt_password b/static/etc/pki/vdsm/keys/libvirt_password similarity index 100% rename from vdsm/libvirt_password rename to static/etc/pki/vdsm/keys/libvirt_password diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 13b7f68..dbcde97 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -52,7 +52,6 @@ $(nodist_man8_MANS)
EXTRA_DIST = \ - libvirt_password \ mk_sysprep_floppy.in \ vdsm-gencerts.sh.in \ vdsm-libvirt-access.pkla \ @@ -69,7 +68,6 @@ chmod 775 $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
install-data-local: \ - install-data-libvirtpass \ install-data-logrotate \ install-data-vdsmconf $(MKDIR_P) $(DESTDIR)$(vdsmrepo) @@ -92,17 +90,8 @@ $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
uninstall-local: \ - uninstall-data-libvirtpass \ uninstall-data-logrotate \ uninstall-data-vdsmconf - -install-data-libvirtpass: - $(MKDIR_P) $(DESTDIR)$(vdsmtsdir)/keys - $(INSTALL_DATA) -m 600 $(srcdir)/libvirt_password \ - $(DESTDIR)$(vdsmtsdir)/keys/libvirt_password - -uninstall-data-libvirtpass: - $(RM) $(DESTDIR)$(vdsmtsdir)/keys/libvirt_password
install-data-logrotate: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/cron.hourly