summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-08-05 10:45:43 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-08-05 10:45:43 +0200
commita167272caa8899e8e043bb0b6501dbfe1ce3f33c (patch)
tree4d5911c3fed1707d74337fa6fb02c61187565b91
parent6f69dc77ed125a139ddd8f2badb97946351806b6 (diff)
downloadNetworkManager-bg/dispatch-sync-requests-rh746703.tar.gz
fixup! nm-dispatcher: allow scripts to be marked as no-waitbg/dispatch-sync-requests-rh746703
-rw-r--r--callouts/Makefile.am1
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec2
2 files changed, 0 insertions, 3 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index c192889ef8..7bc7273032 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -95,7 +95,6 @@ install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
- $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d
CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA)
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index c88b9c5b05..2d9618dfdb 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -459,7 +459,6 @@ mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/VPN
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
%{__cp} examples/dispatcher/10-ifcfg-rh-routes.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/
%{__ln_s} ../10-ifcfg-rh-routes.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/
@@ -528,7 +527,6 @@ fi
%{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
-%dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
%dir %{_sysconfdir}/%{name}/dnsmasq.d
%dir %{_sysconfdir}/%{name}/VPN