Dima Kuznetsov has uploaded a new change for review. Change subject: hooks: Include sudoers file in ethtool_options rpm ......................................................................
hooks: Include sudoers file in ethtool_options rpm The hook contained the file and the rules to install it but never invoked the as part of the build. Change-Id: I3f1529452050370c82eb2a2675b74c2e5136d427 Signed-off-by: Dima Kuznetsov <[email protected]> --- M debian/vdsm-hook-ethtool-options.install M vdsm.spec.in M vdsm_hooks/ethtool_options/Makefile.am 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/35725/1 diff --git a/debian/vdsm-hook-ethtool-options.install b/debian/vdsm-hook-ethtool-options.install index 4f93300..3609f3a 100644 --- a/debian/vdsm-hook-ethtool-options.install +++ b/debian/vdsm-hook-ethtool-options.install @@ -1 +1,2 @@ usr/libexec/vdsm/hooks/after_network_setup/30_ethtool_options +etc/sudoers.d/50_vdsm_hook_ethtool_options diff --git a/vdsm.spec.in b/vdsm.spec.in index 86a43c7..fcfe717 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1380,6 +1380,7 @@ %files hook-ethtool-options %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/30_ethtool_options +%{_sysconfdir}/sudoers.d/50_vdsm_hook_ethtool_options %files hook-ipv6 %defattr(-, root, root, -) diff --git a/vdsm_hooks/ethtool_options/Makefile.am b/vdsm_hooks/ethtool_options/Makefile.am index c6b108b..220675c 100644 --- a/vdsm_hooks/ethtool_options/Makefile.am +++ b/vdsm_hooks/ethtool_options/Makefile.am @@ -19,14 +19,16 @@ # EXTRA_DIST = \ - ethtool_options.py + ethtool_options.py \ + sudoers \ + $(NULL) -install-data-local: +install-data-local: install-data-sudoers $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_network_setup $(INSTALL_SCRIPT) $(srcdir)/ethtool_options.py \ $(DESTDIR)$(vdsmhooksdir)/after_network_setup/30_ethtool_options -uninstall-local: +uninstall-local: uninstall-data-sudoers $(RM) $(DESTDIR)$(vdsmhooksdir)/after_network_setup/30_ethtool_options install-data-sudoers: -- To view, visit http://gerrit.ovirt.org/35725 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f1529452050370c82eb2a2675b74c2e5136d427 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
