diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-01-08 13:55:50 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-01-08 14:27:18 +0100 |
| commit | bc7ad75d991c2d9b367d5f432c43a456a7faa8db (patch) | |
| tree | 5eb6c5c0f9fa2d6df3e4d8585b59ec9704bced2a | |
| parent | 7976edb7234eb8caf6abcf00d24627883552dd75 (diff) | |
| download | NetworkManager-bc7ad75d991c2d9b367d5f432c43a456a7faa8db.tar.gz | |
contrib/rpm: install pre-up dispatcher script "10-ifcfg-rh-routes.sh" as no-wait
The main reason to introduce the "no-wait.d" dispatcher directory was
"10-ifcfg-rh-routes.sh", which (as a pre-up script) delays activation.
We even extracted the script to a separate package on RHEL to avoid
delays by default.
Invoke the script via no-wait.d.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 4 | ||||
| -rwxr-xr-x | examples/dispatcher/10-ifcfg-rh-routes.sh | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 029111f603..0d623c804e 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -412,7 +412,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d mkdir -p %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/pre-down.d mkdir -p %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/ -ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/ +ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/ +ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/ mkdir -p %{buildroot}%{_datadir}/gnome-vpn-properties @@ -478,6 +479,7 @@ fi %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/no-wait.d/10-ifcfg-rh-routes.sh %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh %dir %{_sysconfdir}/%{name}/dnsmasq.d %dir %{_sysconfdir}/%{name}/VPN diff --git a/examples/dispatcher/10-ifcfg-rh-routes.sh b/examples/dispatcher/10-ifcfg-rh-routes.sh index 75b8c5e5e9..59e44db517 100755 --- a/examples/dispatcher/10-ifcfg-rh-routes.sh +++ b/examples/dispatcher/10-ifcfg-rh-routes.sh @@ -8,6 +8,9 @@ # This should be installed in both dispatcher.d/ and # dispatcher.d/pre-up.d/ +# pre-up scripts delay activation of the device. To reduce the delay, +# it is adviced to install the script as symlink to no-wait.d directory. + if [ "$2" != "pre-up" -a "$2" != "down" ]; then exit 0 fi |