diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2021-08-10 01:52:05 +0200 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2021-08-11 12:03:29 +0200 |
| commit | 328b7121ee011c076c205d64ab025776300ce517 (patch) | |
| tree | ee4d24f8e1c7391e31db1ebb78e58ef7fd22be9d /redhat | |
| parent | Merge pull request #9330 from idryzhov/vtysh-srv6 (diff) | |
| download | frr-328b7121ee011c076c205d64ab025776300ce517.tar.xz frr-328b7121ee011c076c205d64ab025776300ce517.zip | |
redhat: Install frr.conf only if no per daemon config exists
Install frr.conf template as a template file, but only install it
as a config file if no per daemon file exists. This will use the
integrated config with new setups, but keeps the per-daemon config
for existing users
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/frr.spec.in | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index fbe4c4a1f..066c45f55 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -451,7 +451,7 @@ ln -s %{_sbindir}/frrinit.sh %{buildroot}%{_initddir}/frr %endif install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr -install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr +install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr/frr.conf.template install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr install -m644 %{zeb_rh_src}/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr install -d -m750 %{buildroot}%{rundir} @@ -558,24 +558,15 @@ zebra_spec_add_service fabricd 2618/tcp "Fabricd vty" /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir -# Create dummy files if they don't exist so basic functions can be used. +# Create dummy config file if they don't exist so basic functions can be used. if [ ! -e %{configdir}/zebra.conf ]; then - echo "hostname `hostname`" > %{configdir}/zebra.conf + # per daemon configs exist + mv %{configdir}/frr.conf.template %{configdir}/frr.conf %if 0%{?frr_user:1} - chown %{frr_user}:%{frr_user} %{configdir}/zebra.conf* + chown %{frr_user}:%{frr_user} %{configdir}/frr.conf %endif - chmod 640 %{configdir}/zebra.conf* + chmod 640 %{configdir}/frr.conf fi -for daemon in %{all_daemons} ; do - if [ x"${daemon}" != x"" ] ; then - if [ ! -e %{configdir}/${daemon}.conf ]; then - touch %{configdir}/${daemon}.conf - %if 0%{?frr_user:1} - chown %{frr_user}:%{frr_user} %{configdir}/${daemon}.conf* - %endif - fi - fi -done %if 0%{?frr_user:1} chown %{frr_user}:%{frr_user} %{configdir}/daemons %endif |