Martin Polednik has uploaded a new change for review. Change subject: configs: move networkmanager to static ......................................................................
configs: move networkmanager to static Part of the move of static files to new directory. Change-Id: I703fe90fb8f05af81eda8b0d8821f60d2993a82a Signed-off-by: Martin Polednik <[email protected]> --- R static/90-vdsm-monitor-connection-files.conf M static/Makefile.am M vdsm/Makefile.am 3 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/61618/1 diff --git a/vdsm/90-vdsm-monitor-connection-files.conf b/static/90-vdsm-monitor-connection-files.conf similarity index 100% rename from vdsm/90-vdsm-monitor-connection-files.conf rename to static/90-vdsm-monitor-connection-files.conf diff --git a/static/Makefile.am b/static/Makefile.am index 5ce739c..8d8a7d8 100644 --- a/static/Makefile.am +++ b/static/Makefile.am @@ -58,6 +58,12 @@ vdsm-modules-load.d.conf \ $(NULL) +networkmanagerconfdir = $(sysconfdir)/NetworkManager/conf.d + +networkmanagerconf_DATA = \ + 90-vdsm-monitor-connection-files.conf \ + $(NULL) + CLEANFILES = \ $(rwtab_DATA) \ $(sudoers_DATA) \ @@ -66,6 +72,7 @@ EXTRA_DIST = \ $(limits_DATA) \ $(modulesload_DATA) \ + $(networkmanagerconf_DATA) \ $(vdsmconf_DATA) \ $(vdsmconfrotate_DATA) \ sudoers.vdsm.in \ diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index cd66b25..1fd1fd0 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -67,7 +67,6 @@ $(nodist_man8_MANS) EXTRA_DIST = \ - 90-vdsm-monitor-connection-files.conf \ bonding-defaults.json \ bonding-name2numeric.json \ dumpStorageTable.py.in \ @@ -97,7 +96,6 @@ install-data-dhclient-hooks \ install-data-libvirtpass \ install-data-logrotate \ - install-data-networkmanager \ install-data-sysctl \ install-data-vdsmconf $(MKDIR_P) $(DESTDIR)$(vdsmrepo) @@ -122,7 +120,6 @@ uninstall-data-dhclient-hooks \ uninstall-data-libvirtpass \ uninstall-data-logrotate \ - uninstall-data-networkmanager \ uninstall-data-sysctl \ uninstall-data-vdsmconf @@ -152,14 +149,6 @@ uninstall-data-logrotate: $(RM) $(DESTDIR)$(sysconfdir)/cron.hourly/vdsm-logrotate - -install-data-networkmanager: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d - $(INSTALL_DATA) 90-vdsm-monitor-connection-files.conf \ - $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d - -uninstall-data-networkmanager: - $(RM) $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d/90-vdsm-monitor-connection-files.conf install-data-sysctl: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d -- To view, visit https://gerrit.ovirt.org/61618 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I703fe90fb8f05af81eda8b0d8821f60d2993a82a 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]
