diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-05 19:44:37 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-05-05 19:45:38 +0200 |
| commit | 0e7f93faea67183f200b584d344e4940c0997f19 (patch) | |
| tree | 92939e25a396b5d6afeda64d4ebcb10d98f4b152 | |
| parent | f1d23c32c3622d55c13304d025eb1f55f7774578 (diff) | |
| parent | a38aa2fdb285ae6f9907f75dcf5253f1b90c9ba8 (diff) | |
| download | NetworkManager-0e7f93faea67183f200b584d344e4940c0997f19.tar.gz | |
contrib/rpm: merge branch 'th/dispatcher-routing-rules'
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 54a78a55f1..f4c0236b97 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -325,6 +325,18 @@ ethernet devices with no carrier. This package is intended to be installed by default for server deployments. +%package dispatcher-routing-rules +Summary: NetworkManager dispatcher file for advanced routing rules +Group: System Environment/Base +BuildArch: noarch +Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release} + +%description dispatcher-routing-rules +This adds a NetworkManager dispatcher file to support networking +configurations using "/etc/sysconfig/network-scripts/rule-NAME" files +(eg, to do policy-based routing). + %if 0%{with_nmtui} %package tui Summary: NetworkManager curses-based UI @@ -499,12 +511,9 @@ fi %{_datadir}/bash-completion/completions/nmcli %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/dispatcher.d -%{_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/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}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/VPN @@ -634,6 +643,11 @@ fi %dir %{nmlibdir}/conf.d %{nmlibdir}/conf.d/00-server.conf +%files dispatcher-routing-rules +%{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh +%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh +%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh + %if %{with nmtui} %files tui %{_bindir}/nmtui |