Martin Polednik has uploaded a new change for review. Change subject: static: move vdsm bonding defaults under static ......................................................................
static: move vdsm bonding defaults under static Part of the move of static files to new directory. The files are moved to corresponding *expected* path under static (/usr/share/vdsm). Change-Id: I9cbd81e59aec49876e15337d7cd617e51316a604 Signed-off-by: Martin Polednik <[email protected]> --- M static/Makefile.am R static/usr/share/vdsm/bonding-defaults.json R static/usr/share/vdsm/bonding-name2numeric.json M vdsm/Makefile.am 4 files changed, 6 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/62537/1 diff --git a/static/Makefile.am b/static/Makefile.am index f182190..5024d63 100644 --- a/static/Makefile.am +++ b/static/Makefile.am @@ -20,6 +20,11 @@ include $(top_srcdir)/build-aux/Makefile.subs +vdsm_DATA = \ + ./usr/share/vdsm/bonding-defaults.json \ + ./usr/share/vdsm/bonding-name2numeric.json \ + $(NULL) + vdsmconf_DATA = \ ./etc/vdsm/logger.conf \ ./etc/vdsm/mom.conf \ @@ -101,6 +106,7 @@ $(modulesload_DATA) \ $(sysctl_DATA) \ $(vdsmconfrotate_DATA) \ + $(vdsm_DATA) \ ./etc/rwtab.d/vdsm.in \ ./etc/sudoers.d/50_vdsm.in \ ./etc/vdsm/logger.conf.in \ diff --git a/vdsm/bonding-defaults.json b/static/usr/share/vdsm/bonding-defaults.json similarity index 100% rename from vdsm/bonding-defaults.json rename to static/usr/share/vdsm/bonding-defaults.json diff --git a/vdsm/bonding-name2numeric.json b/static/usr/share/vdsm/bonding-name2numeric.json similarity index 100% rename from vdsm/bonding-name2numeric.json rename to static/usr/share/vdsm/bonding-name2numeric.json diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 6518129..734c900 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -67,8 +67,6 @@ $(nodist_man8_MANS) EXTRA_DIST = \ - bonding-defaults.json \ - bonding-name2numeric.json \ dumpStorageTable.py.in \ libvirt_password \ mk_sysprep_floppy.in \ @@ -91,7 +89,6 @@ chmod 775 $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels install-data-local: \ - install-data-bonding-defaults \ install-data-dhclient-hooks \ install-data-libvirtpass \ install-data-logrotate \ @@ -114,7 +111,6 @@ $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels uninstall-local: \ - uninstall-data-bonding-defaults \ uninstall-data-dhclient-hooks \ uninstall-data-libvirtpass \ uninstall-data-logrotate \ @@ -127,16 +123,6 @@ uninstall-data-libvirtpass: $(RM) $(DESTDIR)$(vdsmtsdir)/keys/libvirt_password - -install-data-bonding-defaults: - $(INSTALL_DATA) -m 600 $(srcdir)/bonding-defaults.json \ - $(DESTDIR)$(vdsmdir)/bonding-defaults.json - $(INSTALL_DATA) -m 600 $(srcdir)/bonding-name2numeric.json \ - $(DESTDIR)$(vdsmdir)/bonding-name2numeric.json - -uninstall-data-bonding-defaults: - $(RM) $(DESTDIR)$(vdsmdir)/bonding-defaults.json - $(RM) $(DESTDIR)$(vdsmdir)/bonding-name2numeric.json install-data-logrotate: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/cron.hourly -- To view, visit https://gerrit.ovirt.org/62537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cbd81e59aec49876e15337d7cd617e51316a604 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
